move 2013.8.29

2013-08-30 09:34:21 +08:00 · 2013-08-30 09:34:21 +08:00 · 4d82cad51d
parent 4f2b26a9c5
commit 4d82cad51d
114 changed files with 3096 additions and 118 deletions
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@ -33,6 +33,9 @@ class BoardsController < ApplicationController
      @board = @boards.first
      show
    end
+    if @project.project_type
+      render :layout => 'base_courses'
+    end
  end

  def show
@ -54,7 +57,11 @@ class BoardsController < ApplicationController
          preload(:author, {:last_reply => :author}).
          all
        @message = Message.new(:board => @board)
-        render :action => 'show', :layout => !request.xhr?
+        if @project.project_type
+          render :action => 'show', :layout => 'base_courses'
+        else
+          render :action => 'show', :layout => !request.xhr?
+        end
      }
      format.atom {
        @messages = @board.messages.
@ -70,6 +77,9 @@ class BoardsController < ApplicationController
  def new
    @board = @project.boards.build
    @board.safe_attributes = params[:board]
+    if @project.project_type
+      render :layout => 'base_courses'
+    end
  end

  def create
@ -90,6 +100,9 @@ class BoardsController < ApplicationController
  end

  def update
+    if @project.project_type
+      render :layout => 'base_courses'
+    end
    @board.safe_attributes = params[:board]
    if @board.save
      redirect_to_settings_in_projects
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@ -40,11 +40,18 @@ class DocumentsController < ApplicationController
      @grouped = documents.group_by(&:category)
    end
    @document = @project.documents.build
-    render :layout => false if request.xhr?
+    if @project.project_type
+      render :layout => 'base_courses'
+    else
+      render :layout => false if request.xhr?
+    end
  end

  def show
    @attachments = @document.attachments.all
+    if @project.project_type
+          render :action => 'show', :layout => 'base_courses'
+    end
  end

  def new
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@ -34,11 +34,20 @@ class FilesController < ApplicationController

    @containers = [ Project.includes(:attachments).reorder(sort_clause).find(@project.id)]
    @containers += @project.versions.includes(:attachments).reorder(sort_clause).all.sort.reverse
-    render :layout => !request.xhr?
+    @course_tag = @project.project_type
+    if @course_tag
+      render :layout => 'base_courses'
+    else
+      render :layout => !request.xhr? 
+    end
  end

  def new
    @versions = @project.versions.sort
+    @course_tag = @project.project_type
+    if @course_tag
+      render :layout => 'base_courses'
+    end
  end

  def create
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@ -49,7 +49,11 @@ class MessagesController < ApplicationController
      all

    @reply = Message.new(:subject => "RE: #{@message.subject}")
-    render :action => "show", :layout => "base_projects"#by young
+    if @message.board.project.project_type
+      render :action => "show", :layout => "base_courses"#by young
+    else
+      render :action => "show", :layout => "base_projects"#by young
+    end
  end

  # Create a new topic
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -19,14 +19,15 @@ class ProjectsController < ApplicationController
  layout 'base_projects'# by young
  menu_item :overview
  menu_item :roadmap, :only => :roadmap
-#  menu_item :settings, :only => :settings
+  menu_item :settings, :only => :settings
+  menu_item :homework, :only => :homework

-  before_filter :find_project, :except => [ :index, :list, :new, :create, :copy ]
-  before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, :statistics, :feedback]
+  before_filter :find_project, :except => [ :index, :list, :new, :create, :copy, :statistics]
+  before_filter :authorize, :except => [:new_homework, :homework, :statistics, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, :statistics, :feedback]
  before_filter :authorize_global, :only => [:new, :create]
  before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
  #by young
-  before_filter :member, :file, :statistics
+  before_filter :member, :file
  #
  accept_rss_auth :index
  accept_api_auth :index, :show, :create, :update, :destroy
@ -36,7 +37,9 @@ class ProjectsController < ApplicationController
      controller.send :expire_action, :controller => 'welcome', :action => 'robots'
    end
  end
-
+  
+  helper :bids
+  include BidsHelper
  helper :sort
  include SortHelper
  helper :custom_fields
@ -51,32 +54,11 @@ class ProjectsController < ApplicationController
  helper :activities
  helper :documents
  helper :watchers
-  
+
  ### added by william
  include ActsAsTaggableOn::TagsHelper
-
-  # Lists visible projects
-#  def index
-#    respond_to do |format|
-#      format.html {
-#        scope = Project
-#        unless params[:closed]
-#          scope = scope.active
-#        end
-#        @projects = scope.visible.order('lft').all
-#      }
-#      format.api  {
-#        @offset, @limit = api_offset_and_limit
-#        @project_count = Project.visible.count
-#        @projects = Project.visible.offset(@offset).limit(@limit).order('lft').all
-#      }
-#      format.atom {
-#        projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).all
-#        render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
-#      }
-#    end
-#  end
-
+  
+ 
  def index
    #Modified by nie
    # @offset, @limit = api_offset_and_limit({:limit => 10})
@ -123,6 +105,33 @@ class ProjectsController < ApplicationController
    end
  end
  
+  #Added by young
+ def homework
+    @offset, @limit = api_offset_and_limit({:limit => 10})
+    @bids = Bid.visible
+    @bids = @bids.like(params[:name]) if params[:name].present?
+    @bid_count = @bids.count
+    @bid_pages = Paginator.new @bid_count, @limit, params['page']
+    
+    @offset ||= @bid_pages.reverse_offset
+    #@bids = @bids.offset(@offset).limit(@limit).all.reverse
+    unless @offset == 0
+      @bids = @bids.offset(@offset).limit(@limit).all.reverse
+    else
+      limit = @bid_count % @limit
+      @bids = @bids.offset(@offset).limit(limit).all.reverse
+    end
+    render :layout => 'base_courses'
+ end
+ 
+ def new_homework
+    @homework = Bid.new
+    @homework.safe_attributes = params[:bid] 
+    render :layout => 'base_courses'
+ end
+#Ended by young
+
+  
  def feedback
    @jours = @project.journals_for_messages.reverse
    @limit =  10
@ -134,14 +143,17 @@ class ProjectsController < ApplicationController
  end

  def new
+    @course_tag = params[:course]
    @issue_custom_fields = IssueCustomField.sorted.all
    @trackers = Tracker.sorted.all
    @project = Project.new
    @project.safe_attributes = params[:project]
    render :layout => 'base' 
  end
+  

  def create
+    @course_tag = params[:project][:project_type]
    @issue_custom_fields = IssueCustomField.sorted.all
    @trackers = Tracker.sorted.all
    @project = Project.new
@ -163,8 +175,12 @@ class ProjectsController < ApplicationController
          if params[:continue]
            attrs = {:parent_id => @project.parent_id}.reject {|k,v| v.nil?}
            redirect_to new_project_path(attrs)
+          #Added by young
+          elsif params[:course_continue]
+            redirect_to new_project_path(:course => '1')
+          #Ended by young
          else
-            redirect_to settings_project_path(@project)
+            redirect_to settings_project_path(@project, :course => @course_tag)
          end
        }
        format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
@ -276,8 +292,9 @@ class ProjectsController < ApplicationController
    end
    @document = @project.documents.build
 #
+    @base_courses_tag = @project.project_type
    respond_to do |format|
-      format.html
+      format.html{render :layout => 'base_courses' if @base_courses_tag }
      format.api
    end
  end
@ -289,6 +306,12 @@ class ProjectsController < ApplicationController
    @member ||= @project.members.new
    @trackers = Tracker.sorted.all
    @wiki ||= @project.wiki
+    #Added by young
+    @course_tag = params[:course]
+    if @course_tag == '1'
+      render :layout => 'base_courses'
+    end
+    #Ended by young
  end

  def edit
@ -302,9 +325,6 @@ class ProjectsController < ApplicationController
  def file
  end
  
-  def statistics
-    
-  end
  #end

  def update
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@ -43,15 +43,26 @@ class RepositoriesController < ApplicationController
    @repository = Repository.factory(scm)
    @repository.is_default = @project.repository.nil?
    @repository.project = @project
-    render :layout => 'base_projects'
+    @course_tag = params[:course]
+    if @course_tag
+      render :layout => 'base_courses'
+    else
+      render :layout => 'base_projects'
+    end
  end
  
+  
  def newrepo
    scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
    @repository = Repository.factory(scm)
    @repository.is_default = @project.repository.nil?
    @repository.project = @project
-    render :layout => 'base_projects'
+    @course_tag = params[:course]
+    if @course_tag
+      render :layout => 'base_courses'
+    else
+      render :layout => 'base_projects'
+    end
  end
  
  def fork
@ -209,7 +220,12 @@ class RepositoriesController < ApplicationController
      @changesets = @repository.latest_changesets(@path, @rev)
      @properties = @repository.properties(@path, @rev)
      @repositories = @project.repositories
-      render :action => 'show', :layout => 'base_projects'
+      @course_tag = params[:course]
+      if @course_tag
+        render :action => 'show', :layout => 'base_courses'
+      else
+        render :action => 'show', :layout => 'base_projects'
+      end
    end
  end

@ -369,6 +385,8 @@ class RepositoriesController < ApplicationController
  end

  def stats
+    @project_id = params[:id]
+    @repository_id = @repository.identifier
    render :layout => 'base_projects'
  end

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@ -35,8 +35,20 @@ module ProjectsHelper
            {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities}
            ]
    tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
+    
  end
-
+  
+  #Added by young
+  def course_settings_tabs
+    tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
+            {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
+            {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural}
+            ]
+    tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
+    
+  end
+  #Ended by young
+  
  def parent_project_select_tag(project)
    selected = project.parent
    # retrieve the requested parent project
@ -54,7 +66,13 @@ module ProjectsHelper
  # Renders the projects index
  def render_project_hierarchy(projects)
    render_project_nested_lists(projects) do |project|
-      s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")
+      #Modified by young
+      if project.project_type
+        s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")+"<span style='color:#F00;'>(#{l(:label_course)})</span>".html_safe
+      else
+        s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")
+      end
+      #Ended by young
      if project.description.present?
        #Delete by nie.
        # s << content_tag('td', textilizable(project.short_description, :project => project), :class => 'wiki description')
--- a/app/models/journals_for_message_observer.rb
+++ b/app/models/journals_for_message_observer.rb
@ -0,0 +1,7 @@
+# Added by young
+class JournalsForMessageObserver < ActiveRecord::Observer
+  def after_create(journal_for_message)
+    Mailer.journals_for_message_add(User.current, journal_for_message).deliver
+  end
+end
+
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@ -26,6 +26,15 @@ class Mailer < ActionMailer::Base
  def self.default_url_options
    { :host => Setting.host_name, :protocol => Setting.protocol }
  end
+  
+  # Builds a Mail::Message object used to email recipients of the added journals for message.
+  #
+  def journals_for_message_add(user, journals_for_message)
+    @user = User.current
+    @url = url_for(:controller => 'users', :action => 'user_newfeedback')
+    mail :to => user.mail,
+      :subject => "hello"
+  end

  # Builds a Mail::Message object used to email recipients of the added issue.
  #
--- a/app/models/project.rb
+++ b/app/models/project.rb
@ -681,7 +681,8 @@ class Project < ActiveRecord::Base
    'custom_field_values',
    'custom_fields',
    'tracker_ids',
-    'issue_custom_field_ids'
+    'issue_custom_field_ids',
+    'project_type'

  safe_attributes 'enabled_module_names',
    :if => lambda {|project, user| project.new_record? || user.allowed_to?(:select_project_modules, project) }
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title><%= h html_title %></title>
+		<meta name="description" content="<%= Redmine::Info.app_name %>" />
+		<meta name="keywords" content="issue,bug,tracker" />
+		<%= csrf_meta_tag %>
+		<%= favicon %>
+		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
+		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+		<%= javascript_heads %>
+		<%= heads_for_theme %>
+		<%= call_hook :view_layouts_base_html_head %>
+		<!-- page specific tags -->
+		<%= yield :header_tags -%>
+	</head>
+	<!--add by huang-->
+	<body class="<%= h body_css_classes %>">
+		<div id="wrapper">
+			<div id="wrapper2">
+				<div id="wrapper3">
+					<%= render :partial => 'layouts/base_header'%>
+
+					<div id="main">
+						<!--project page-->
+						<div id="sidebar">
+							<div class="spaceleft">
+								<!--informations-->
+								<div class="inf_user_image">
+									<% @project = Project.find_by_id(@project.id)%>
+									<table>
+										<tr>
+											<td><%= link_to image_tag(url_to_avatar(@project), :class => 'avatar2') %></td>
+											<td align="center">
+											<div class="info_font" style=" word-wrap: break-word; word-break: break-all">
+												<%= textilizable @project.name %>
+											</div>
+											</td>
+										</tr>
+									</table>												
+								</div>
+
+								<!--parameter-->
+								<div class="user_fans">
+									
+									<table width="240" border="0">
+										<tr align="center" width="80px">
+											<% files_count = @project.attachments.count %>
+											<% @project.versions.each do |version| %>
+											<% files_count += version.attachments.count %>
+											<% end %>
+
+											<td class="font_index"><%=link_to "#{@project.members.count}", project_member_path(@project) %></td>
+											<td class="font_index"><%=link_to "#{@project.issues.count}", project_issues_path(@project) %></td>
+											<td class="font_index"><%=link_to files_count, project_files_path(@project) %></td>
+										<tr class="font_aram">
+											<td align="center" width="80px"> <%= l(:label_course_student) %></td> 
+											<td align="center" width="80px"> <%= l(:label_homework) %></td>
+											<td align="center" width="80px"><%= l(:label_course_data) %></td>
+										</tr>
+									</table>
+									<div class="user_underline"></div>
+								</div>
+
+								<!--description-->
+								<div class="inf_user_context">
+									<div class="font_title_left">
+										<%= l(:label_project_overview) %>
+									</div>
+									
+									<div style="padding-bottom: 8px">
+										<div class="font_lighter_sidebar">
+											
+											<%= textilizable @project.description %>
+										</div>
+										<div class="created_on_project">
+											<strong style="color: #068d9c"><%= l(:label_create_time) %>：</strong><%= @project.created_on %>
+										</div>
+									</div>
+									<div class="user_underline"></div>
+								</div>
+															<!--tags-->																
+									
+									<div class="user_fans">
+										<!-- added by william -for tag -->
+										<div class="user_tags">
+										<div id="tags">
+											<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
+										</div></div>
+									</div>
+
+
+								<!--tool-->
+								<div class="user_underline"></div>
+								<div class="tool">
+									<div class="font_title_left">
+										<%= l(:label_project_tool)%>
+									</div>
+									
+									<table class="font_tool">
+										<tr>
+											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
+												<%= link_to l(:project_module_documents),project_documents_path(@project) %></td>
+										</tr>
+										<tr>
+											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
+												<%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
+											</td>
+										</tr>
+									</table>
+								</div>
+								<div class="user_underline"></div>
+							</div>
+						</div>
+						<div id="content">
+							<div>教师名称：XXX</div>
+							<div>所在单位：并行与分布重点实验室</div>
+							<div>课程学分：X学分</div>
+							<div>课程学时：XX学时</div>
+							<div>XXXX：XXXXXXXX</div>
+							<div class="tabs">
+								<ul>
+									<li><%= link_to(l(:label_overview), project_path(@project))%></li>
+									<li><%= link_to(l(:label_homework), {:controller => 'projects', :action => 'homework'})%></li>
+					                <li><%= link_to(l(:label_repository), { :controller => 'repositories', :action => 'show', :id => @project, :repository_id => nil, :path => nil, :rev => nil, :course => 1 })%></li>
+								    <li><%= link_to(l(:label_settings),{:controller => 'projects', :action => 'settings', :id => @project, :course => 1})%></li></ul>
+							</div>
+							<%= yield %>
+							<%= call_hook :view_layouts_base_content %>
+							<div style="clear:both;"></div>
+							<%= render_flash_messages %>
+
+						</div>
+						<%= render :partial => 'layouts/base_footer'%>
+					</div>
+
+					<div id="ajax-indicator" style="display:none;">
+						<span><%= l(:label_loading) %></span>
+					</div>
+					<div id="ajax-modal" style="display:none;"></div>
+				</div>
+			</div>
+			<%= call_hook :view_layouts_base_body_bottom %>
+	</body>
+</html>
--- a/app/views/mailer/journals_for_message_added.html.erb
+++ b/app/views/mailer/journals_for_message_added.html.erb
@ -0,0 +1,2 @@
+<h1><%= link_to("hello", @url) %></h1>
+<em><%=h @user %></em>
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@ -39,7 +39,7 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% else %>
 <% @newss.each do |news| %>
-<table width="660px" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
+<table width="660px" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
  <tr>
    <td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(news.author), :class => "avatar") %></td>
    <td><table width="580px" border="0">
--- a/app/views/projects/_course_form.html.erb
+++ b/app/views/projects/_course_form.html.erb
@ -0,0 +1,47 @@
+<%= error_messages_for 'project' %>
+<!--[form:project]-->
+<% unless @project.new_record? %>
+<p><%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %></p>
+<% end %>
+<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p>
+
+<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p><!--by young-->
+<p><%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
+<% unless @project.identifier_frozen? %>
+  <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
+<% end %></p>
+<p style="margin-left:-10px;"><%= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>
+<p style="margin-left:-10px;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></p>
+<p style="display:none;"><%= f.text_field :project_type, :value => 1 %></p>
+
+
+<%= wikitoolbar_for 'project_description' %>
+
+<% @project.custom_field_values.each do |value| %>
+  <p><%= custom_field_tag_with_label :project, value %></p>
+<% end %>
+<%= call_hook(:view_projects_form, :project => @project, :form => f) %>
+
+
+
+<!--[eoform:project]-->
+
+<% unless @project.identifier_frozen? %>
+  <% content_for :header_tags do %>
+    <%= javascript_include_tag 'project_identifier' %>
+  <% end %>
+<% end %>
+
+<% if !User.current.admin? && @project.inherit_members? && @project.parent && User.current.member_of?(@project.parent) %>
+  <%= javascript_tag do %>
+    $(document).ready(function() {
+      $("#project_inherit_members").change(function(){
+        if (!$(this).is(':checked')) {
+          if (!confirm("<%= escape_javascript(l(:text_own_membership_delete_confirmation)) %>")) {
+            $("#project_inherit_members").attr("checked", true);
+          }
+        }
+      });
+    });
+  <% end %>
+<% end %>
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@ -11,8 +11,8 @@
  <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
 <% end %></p>
 <p style="margin-left:-10px;"><%= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>
-<p style="margin-left:-10px;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></p>
-
+<p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :is_public, :style => "margin-left:10px;" %><%= l(:label_public_info) %></em></p>
+<p style="display:none;"><%= f.text_field :project_type, :value => 0 %></p>

 <%= wikitoolbar_for 'project_description' %>

--- a/app/views/projects/homework.html.erb
+++ b/app/views/projects/homework.html.erb
@ -0,0 +1,34 @@
+<!-- fq -->
+
+<div class="project-search-block">
+	<table width="100%" valign="center">
+		<tr>
+			<td width="16%"><span style="margin-left:0px"><%= l(:label_course_homework_list)%></span></td>
+			<td valign="center"><% if User.current.logged? %>
+	
+		<!-- <div class='icon icon-add'> -->
+			<%= link_to(l(:label_course_homework_new), {:controller => 'projects', :action => 'new_homework'}, :class => 'icon icon-add') %>
+			<!-- <%= toggle_link l(:label_new_call), 'put-bid-form', {:focus => 'project_id'} %> -->
+		<!-- </div> -->
+	<% end %></td>
+	
+
+	<td align="right">
+	<div class="project-search">
+		<%= text_field_tag 'name', params[:name], :size => 30 %>
+		<%= submit_tag l(:label_search), :class => "small", :name => nil %>
+	</div></td>
+	</tr></table>
+</div>
+
+
+<% if User.current.logged? %>
+<div id="put-bid-form" style="display: none">
+	<%= render :partial => 'bids/new_bid' %>
+</div>
+<% end %>
+
+<div id="bid-show">
+	<%= render :partial => 'bids/bid_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
+</div>
+
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@ -7,8 +7,8 @@
 	<table width="100%" valign="center">
 		<tr>
 			<td width="16%"><span style="margin-left:0px"><%= l(:label_project_plural)%></span></td>
-			<td valign="center"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
-
+			<td valign="center"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
+            <td valign="center"><%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
 			<td align="right">
 			<div class="project-search">
 				<%= text_field_tag 'name', params[:name], :size => 30 %>
@ -17,12 +17,12 @@
 		</tr>
 	</table>
 </div>
-<%end%>
+<% end %>

 <div id="projects-index">
 	<%= render_project_hierarchy(@projects)%>
 </div>
-<!-- <p class="pagination"><%= pagination_links_full @project_pages%></p> -->
+
 <div class="pagination">
 	<ul>
 		<%= pagination_links_full @project_pages %>
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@ -1,12 +1,19 @@
-<h3><%=l(:label_project_new)%></h3>
-
 <%= labelled_form_for @project do |f| %>
 <!--Added by young-->
-<div class="box tabular">
-	<%= render :partial => 'form', :locals => { :f => f } %>
-	<%= submit_tag l(:button_create) %>
-	<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
-	<%= javascript_tag "$('#project_name').focus();" %>
-	<% end %>
-</div>
+	<% if @course_tag == '1' %>
+		<h3><%=l(:label_course_new)%></h3>
+		<div class="box tabular">
+    	<%= render :partial => 'course_form', :locals => { :f => f } %>
+    	<%= submit_tag l(:button_create) %>
+	    <%= submit_tag l(:button_create_and_continue), :name => 'course_continue' %>
+    <% else %>
+		<h3><%=l(:label_project_new)%></h3>
+		<div class="box tabular">
+    	<%= render :partial => 'form', :locals => { :f => f } %>
+    	<%= submit_tag l(:button_create) %>
+	    <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>	
+    <% end %>	
+	<%= javascript_tag "$('#project_name').focus();" %>	
+    </div>
+<% end %>
 <!--Ended by young-->
--- a/app/views/projects/new_homework.html.erb
+++ b/app/views/projects/new_homework.html.erb
@ -0,0 +1,9 @@
+<h3><%=l(:label_course_new_homework)%></h3>
+
+<%= labelled_form_for @homework, :url => {:controller => 'bids', :action => 'create_bid'} do |f| %>
+<div class="box tabular">
+	<%= render :partial => 'bids/form', :locals => { :f => f } %>
+	<%= submit_tag l(:button_create) %>
+	<%= javascript_tag "$('#bid_name').focus();" %>
+	<% end %>
+</div>
--- a/app/views/projects/settings.html.erb
+++ b/app/views/projects/settings.html.erb
@ -1,3 +1,7 @@
 <h3><%=l(:label_settings)%></h3>
-<%= render_tabs project_settings_tabs %>
+<% if @course_tag %>
+	<%= render_tabs course_settings_tabs %>
+<% else %>
+	<%= render_tabs project_settings_tabs %>
+<% end %>
 <% html_title(l(:label_settings)) -%>
--- a/app/views/projects/settings/_repositories.html.erb
+++ b/app/views/projects/settings/_repositories.html.erb
@ -55,11 +55,12 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>

+<% course_tag = @project.project_type %>
 <% if User.current.allowed_to?(:manage_repository, @project) %>
-  <p><%= link_to l(:label_repository_new), new_project_repository_path(@project), :class => 'icon icon-add' %></p>
+  <p><%= link_to l(:label_repository_new), new_project_repository_path(@project, :course => course_tag), :class => 'icon icon-add' %></p>
 <% end %>
 <!-- no repository  ，new  by xianbo-->
 <% if User.current.allowed_to?(:manage_repository, @project) %>
  <p><%= l(:label_repository_no) %> 
-  	<%= link_to l(:label_repository_new_repos), newrepo_project_repository_path(@project), :class => 'icon icon-add' %></p>
+  	<%= link_to l(:label_repository_new_repos), newrepo_project_repository_path(@project, :course => course_tag), :class => 'icon icon-add' %></p>
 <% end %>
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@ -10,7 +10,7 @@
 	<div>
 		<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
 		<div class="issue-note">
-<table width="660px" border="0" align="center">
+<table width="660px" border="0" align="center" style="font-size: 14px;">
  <tr>
    <td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%></td>
    <td><table width="580px" border="0">
--- a/app/views/projects/statistics.html.erb
+++ b/app/views/projects/statistics.html.erb
--- a/app/views/repositories/_navigation.html.erb
+++ b/app/views/repositories/_navigation.html.erb
@ -3,7 +3,7 @@
 <% end %>

 <%= link_to l(:label_statistics),
-            {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
+            {:controller => 'repositories', :action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
            :class => 'icon icon-stats' if @repository.supports_all_revisions? %>

 <%= form_tag({:action => controller.action_name,
--- a/app/views/repositories/stats.html.erb
+++ b/app/views/repositories/stats.html.erb
@ -1,12 +1,6 @@
 <h3><%= l(:label_statistics) %></h3>

-<p>
-<%= tag("embed", :width => 670, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_month")) %>
-</p>
-<p>
-<%= tag("embed", :width => 670, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_author")) %>
-</p>
-
-<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
+<% src = "http://localhost:3000/statistics/"+@project_id+"/index.html"%>
+<iframe src=<%= src %> name="top" style="border:0;width:100%;height:1000px;"></iframe>

 <% html_title(l(:label_repository), l(:label_statistics)) -%>
--- a/app/views/users/info.html.erb
+++ b/app/views/users/info.html.erb
@ -2,7 +2,7 @@
 <% unless @message.empty? %>
 <div id="activity">
 	<% @message.each do |e| -%>
-	<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
+	<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
 		<tr>
 			<!-- fq -->
 			<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(e.user), :class => "avatar"), user_path(e.user), :class => "avatar" %></td>
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@ -3,7 +3,7 @@
 	<% @activity.each do |e| %>
 	<% act = e.act %>
 	<% unless act.nil? %>
-	<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
+	<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
 		<tr>
 			<!-- fq -->
 			<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(e.user), :class => "avatar"), user_path(e.user_id), :class => "avatar" %></td>
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@ -6,7 +6,7 @@
 留言（<%= @feedback_count%>）
 </div>

-<div id="message">
+<div id="message" style="font-size: 14px;">
    <%= render :partial => 'words/message', :locals => {:jour => @jour, :state => @state, :user => @user, :feedback_pages => @feedback_pages} %>
 </div>
 <div class="pagination" style="float:left;">
--- a/app/views/users/user_projects.html.erb
+++ b/app/views/users/user_projects.html.erb
@ -4,7 +4,7 @@
 <ul class="user_project_sort">
 	<% for membership in @memberships %>
 	<li>
-		<table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
+		<table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
 			<tr>
 				<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar') %></td>
 				<td>
--- a/app/views/users/watch_bids.html.erb
+++ b/app/views/users/watch_bids.html.erb
@ -5,7 +5,7 @@

 <% for bid in @bid%>

-<table width="90%" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px; margin-top: 30px;">
+<table width="90%" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px; margin-top: 30px;font-size:14px;">
 	<tr>
 		<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(bid.author), :class => 'avatar'), :class => "avatar" %></td>
 		<td>
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@ -61,7 +61,6 @@
    				<caption>&#187;<%= l(:label_related_issues) %></caption>
   				 	<% issues.each do |issue| -%>
      				<tr class="hascontextmenu">
-        				<td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
        				<td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
     				</tr>
    				<% end -%>
--- a/config/application.rb
+++ b/config/application.rb
@ -23,7 +23,7 @@ module RedmineApp
    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]

    # Activate observers that should always be running.
-    config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
+    config.active_record.observers = :journals_for_message_observer, :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer

    config.active_record.store_full_sti_class = true
    config.active_record.default_timezone = :local
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -653,7 +653,7 @@ en:
  label_query_new: New query
  label_my_queries: My custom queries
  label_filter_add: Add filter
-  label_filter_plural: Filter
+  label_filter_plural: Query condition
  label_equals: is
  label_not_equals: is not
  label_in_less_than: in less than
@ -913,8 +913,8 @@ en:
  button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
  button_add: Add
  button_change: Change
-  button_apply: Apply
-  button_clear: Clear
+  button_apply: Query
+  button_clear: Cancel query
  button_lock: Lock
  button_unlock: Unlock
  button_download: Download
@ -1317,3 +1317,13 @@ en:
  label_bids_published_ago: ago  
  label_welcome_trustie: Trustie forge
  label_welcome_trustie_description: a socialized collaboration platform for project management, collaborative research, software development and software crowdsourcing for creative university students and entrepreneurs.
+
+  label_course: Course
+  label_course_new: New course
+  label_public_info: If you don't choose public, only the project's members can see the project.
+  label_course_student: Student
+  label_homework: Homework
+  label_course_new_homework: New homework
+  label_course_homework_list: Homework List
+  label_course_homework_new: new homework
+  label_course_data: Data
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -620,7 +620,7 @@ zh:
  label_query_new: 新建查询
  label_filter_add: 增加过滤器

-  label_filter_plural: 过滤器
+  label_filter_plural: 查询条件
  label_equals: 等于
  label_not_equals: 不等于
  label_in_less_than: 剩余天数小于
@ -856,8 +856,8 @@ zh:
  button_add: 新增
  button_change: 修改

-  button_apply: 应用
-  button_clear: 清除
+  button_apply: 查询
+  button_clear: 取消查询
  button_lock: 锁定
  button_unlock: 解锁
  button_download: 下载
@ -1335,4 +1335,14 @@ zh:
  label_bids_published: 发布于
  label_bids_published_ago: 之前
  label_welcome_trustie: Trustie
-  label_welcome_trustie_description: 面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、协同研究、软件开发和众包平台。
+  label_welcome_trustie_description: 面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、协同研究、软件开发和众包平台。
+  
+  label_course: 课程
+  label_course_new: 新建课程
+  label_public_info: 若不公开，仅项目成员可见该项目
+  label_course_student: 学生
+  label_homework: 作业
+  label_course_new_homework: 新建作业
+  label_course_homework_list: 作业列表
+  label_course_homework_new: 发布作业
+  label_course_data: 资料
--- a/config/routes.rb
+++ b/config/routes.rb
@ -121,23 +121,16 @@ RedmineApp::Application.routes.draw do
  post 'issues/:object_id/watchers', :to => 'watchers#create', :object_type => 'issue'
  delete 'issues/:object_id/watchers/:user_id' => 'watchers#destroy', :object_type => 'issue'
  
-
- resources :projects do
+  resources :projects do
    member do
      get 'settings(/:tab)', :action => 'settings', :as => 'settings'
- #     get 'show', :action => 'show', :as => 'project_show'
- #     get 'activity', :controller => 'activities', :action => 'index', :as => 'activity'
- #     get 'repository', :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :as => 'repository'
      #by young
      get 'member', :controller => 'projects', :action => 'member', :as => 'member'
-#      get 'focus', :action => 'focus', :as => 'focus'
-#      get 'investor', :action => 'investor', :as => 'investor'
-#      get 'issue', :action =>'issue', :as => 'issue'
-#      get 'mission', :action => 'mission', :as => 'mission'
-#      get 'on', :action => 'on', :as => 'on'
      get 'file', :action => 'file', :as => 'file'
      get 'statistics', :action => 'statistics', :as => 'statistics'
      get 'feedback', :action => 'feedback'
+      get 'homework', :action => 'homework', :as => 'homework'
+      get 'new_homework', :action => 'new_homework', :as => 'new_homework'
      #end
      
      post 'modules'
@ -151,22 +144,9 @@ RedmineApp::Application.routes.draw do
    
 #by young
   match '/member', :controller => 'projects', :action => 'member',  :as => 'member', :via => :get
-#   match '/focus', :controller => 'projects', :action => 'focus',  :as => 'focus', :via => :get
-#   match '/mission', :controller => 'projects', :action => 'mission',  :as => 'mission', :via => :get
-#   match '/on', :controller => 'projects', :action => 'on',  :as => 'on', :via => :get
-#   match '/settings(/:tab)', :controller => 'projects', :action => 'settings',  :as => 'settings', :via => :get
   match '/file', :controller => 'projects', :action => 'file',  :as => 'file', :via => :get
   match '/statistics', :controller => 'projects', :action => 'statistics',  :as => 'statistics', :via => :get
-#   match '/investor', :controller => 'projects', :action => 'investor',  :as => 'investor', :via => :get
-   
-#   match '/activity', :controller => 'activities', :action => 'index',  :as => 'activity', :via => :get
-#   match '/repository', :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :as => 'repository', :via => :get
-#   match '/', :controller => 'projects', :action => 'show', :as => 'project_show', :via => :get
-#   get 'projects/:project_id/show', :to => 'projects#show', :as => 'project_show'
-#   get 'projects/:project_id/repository', :to => 'repositories#show', :as => 'project_repository'
-   
-#   match '/show', :controller => 'projects', :action => 'show',  :as => 'project_show', :via => :get
-   
+   match '/homework', :controller => 'projects', :action => 'homework', :as => 'homework', :via => :get
 #end

    resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
--- a/db/migrate/20130827003308_add_project_type_to_project.rb
+++ b/db/migrate/20130827003308_add_project_type_to_project.rb
@ -0,0 +1,9 @@
+class AddProjectTypeToProject < ActiveRecord::Migration
+  def self.up
+    add_column :projects, :project_type, :integer
+  end
+
+  def self.down
+    remove_column :projects, :project_type
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.

-ActiveRecord::Schema.define(:version => 20130819020004) do
+ActiveRecord::Schema.define(:version => 20130827003308) do

  create_table "a_user_watchers", :force => true do |t|
    t.string   "name"
@ -470,6 +470,12 @@ ActiveRecord::Schema.define(:version => 20130819020004) do
    t.datetime "updated_at", :null => false
  end

+  create_table "project_statuses", :force => true do |t|
+    t.integer "changesets_count"
+    t.integer "watchers_count"
+    t.integer "project_id"
+  end
+
  create_table "project_tags", :force => true do |t|
    t.integer  "project_id"
    t.integer  "tag_id"
@ -492,6 +498,7 @@ ActiveRecord::Schema.define(:version => 20130819020004) do
    t.integer  "lft"
    t.integer  "rgt"
    t.boolean  "inherit_members", :default => false, :null => false
+    t.integer  "project_type"
  end

  add_index "projects", ["lft"], :name => "index_projects_on_lft"
@ -648,6 +655,14 @@ ActiveRecord::Schema.define(:version => 20130819020004) do

  add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"

+  create_table "user_statuses", :force => true do |t|
+    t.integer  "changesets_count"
+    t.integer  "watchers_count"
+    t.integer  "user_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
  create_table "user_tags", :force => true do |t|
    t.integer  "user_id"
    t.integer  "tag_id"
--- a/files/2013/08/130806152654_desktop.ini
+++ b/files/2013/08/130806152654_desktop.ini
--- a/files/2013/08/130806153250_desktop.ini
+++ b/files/2013/08/130806153250_desktop.ini
--- a/files/2013/08/130806153331_desktop.ini
+++ b/files/2013/08/130806153331_desktop.ini
--- a/files/2013/08/130806153435_desktop.ini
+++ b/files/2013/08/130806153435_desktop.ini
--- a/files/2013/08/130806153511_desktop.ini
+++ b/files/2013/08/130806153511_desktop.ini
--- a/files/2013/08/130806153649_desktop.ini
+++ b/files/2013/08/130806153649_desktop.ini
--- a/files/2013/08/130806153715_desktop.ini
+++ b/files/2013/08/130806153715_desktop.ini
--- a/files/2013/08/130806153855_desktop.ini
+++ b/files/2013/08/130806153855_desktop.ini
--- a/files/2013/08/130806153935_desktop.ini
+++ b/files/2013/08/130806153935_desktop.ini
--- a/files/2013/08/130806154013_desktop.ini
+++ b/files/2013/08/130806154013_desktop.ini
--- a/files/2013/08/130806154103_desktop.ini
+++ b/files/2013/08/130806154103_desktop.ini
--- a/files/2013/08/130806154135_desktop.ini
+++ b/files/2013/08/130806154135_desktop.ini
--- a/files/2013/08/130806154627_desktop.ini
+++ b/files/2013/08/130806154627_desktop.ini
--- a/files/2013/08/130806154720_desktop.ini
+++ b/files/2013/08/130806154720_desktop.ini
--- a/files/2013/08/130806154826_desktop.ini
+++ b/files/2013/08/130806154826_desktop.ini
--- a/files/2013/08/130806154843_desktop.ini
+++ b/files/2013/08/130806154843_desktop.ini
--- a/files/2013/08/130806154858_desktop.ini
+++ b/files/2013/08/130806154858_desktop.ini
--- a/files/2013/08/130806155359_desktop.ini
+++ b/files/2013/08/130806155359_desktop.ini
--- a/files/2013/08/130806155534_desktop.ini
+++ b/files/2013/08/130806155534_desktop.ini
--- a/files/2013/08/130806155622_desktop.ini
+++ b/files/2013/08/130806155622_desktop.ini
--- a/files/2013/08/130806155745_desktop.ini
+++ b/files/2013/08/130806155745_desktop.ini
--- a/files/2013/08/130806155911_desktop.ini
+++ b/files/2013/08/130806155911_desktop.ini
--- a/files/2013/08/130806160031_desktop.ini
+++ b/files/2013/08/130806160031_desktop.ini
--- a/files/2013/08/130807094116_Chrysanthemum.jpg
+++ b/files/2013/08/130807094116_Chrysanthemum.jpg
--- a/files/2013/08/130807094539_Jellyfish.jpg
+++ b/files/2013/08/130807094539_Jellyfish.jpg
--- a/files/2013/08/130827170642_1675b2d45e868443acb3447a529c1ace.txt
+++ b/files/2013/08/130827170642_1675b2d45e868443acb3447a529c1ace.txt
@ -0,0 +1,4 @@
+客户机操作系统：Ubuntu Linux（64位）
+虚拟机版本：8
+Cpu：2vcpu
+内存：4196MB
--- a/files/2013/08/130829095300_1675b2d45e868443acb3447a529c1ace.txt
+++ b/files/2013/08/130829095300_1675b2d45e868443acb3447a529c1ace.txt
@ -0,0 +1,4 @@
+客户机操作系统：Ubuntu Linux（64位）
+虚拟机版本：8
+Cpu：2vcpu
+内存：4196MB
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@ -241,7 +241,7 @@ Redmine::MenuManager.map :admin_menu do |menu|
  menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
  menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
 end
-#by young
+#Modified by young
 Redmine::MenuManager.map :project_menu do |menu|
  menu.push :overview, { :controller => 'projects', :action => 'show' }
 #  menu.push :activity, { :controller => 'activities', :action => 'index' }
@ -265,7 +265,17 @@ Redmine::MenuManager.map :project_menu do |menu|
  
 end
 #end
+
 #added by young
+Redmine::MenuManager.map :course_menu do |menu|
+  menu.push :overview, { :controller => 'projects', :action => 'show'}
+  menu.push :homework, { :controller => 'projects', :action => 'homework' }
+#  menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
+#  menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_new, :param => :project_id
+  menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :course => 1 }     
+  menu.push :settings, { :controller => 'projects', :action => 'settings', :course => 1 }, :last => true
+  
+end
 Redmine::MenuManager.map :user_menu do |menu|
  menu.push :activity, {:controller => 'users', :action => 'show' }
  menu.push :project, {:controller => 'users', :action => 'user_projects'}
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@ -77,7 +77,7 @@ module Redmine

      # Renders the application main menu
      def render_main_menu(project)
-        render_menu((project && !project.new_record?) ? :project_menu : :application_menu, project)
+          render_menu((project && !project.new_record?) ? :project_menu : :application_menu, project)
      end

      def display_main_menu?(project)
--- a/public/500.html
+++ b/public/500.html
@ -16,7 +16,7 @@ font-size:0.8em;
 }
 </style>
 <body>
-  <h1>Internal error</h1>
+  <h1>Error occurred!</h1>
  <p>An error occurred on the page you were trying to access.<br />
  If you continue to experience problems please contact your Trustie administrator for assistance.</p>
  <p>If you are the Trustie administrator, check your log files for details about the error.</p>
--- a/public/images/avatars/Project/6316
+++ b/public/images/avatars/Project/6316
--- a/public/images/avatars/Project/6356
+++ b/public/images/avatars/Project/6356
--- a/public/images/avatars/Project/6358
+++ b/public/images/avatars/Project/6358
--- a/public/statistics/trustie2/arrow-down.gif
+++ b/public/statistics/trustie2/arrow-down.gif
--- a/public/statistics/trustie2/arrow-none.gif
+++ b/public/statistics/trustie2/arrow-none.gif
--- a/public/statistics/trustie2/arrow-up.gif
+++ b/public/statistics/trustie2/arrow-up.gif
--- a/public/statistics/trustie2/gitstats.cache
+++ b/public/statistics/trustie2/gitstats.cache
--- a/public/statistics/trustie2/gitstats.css
+++ b/public/statistics/trustie2/gitstats.css
@ -0,0 +1,154 @@
+/**
+ * GitStats - default style
+ */
+body {
+	color: black;
+	background-color: #fff;
+}
+
+dt {
+	font-size: 12px;
+	font-weight: bold;
+	float: left;
+	margin-right: 1em;
+	margin-left: 10px;
+}
+
+dt:after {
+	content: ': ';
+}
+
+dd {
+	font-size: 11px;
+	display: block;
+	clear: left;
+}
+
+table {
+	border: 1px solid black;
+	border-collapse: collapse;
+	font-size: 70%;
+	margin-bottom: 1em;
+}
+
+table.noborders {
+	border: none;
+}
+
+table.noborders td {
+	border: none;
+}
+
+.vtable {
+	float: right;
+	clear: both;
+}
+
+table.tags td {
+	vertical-align: top;
+}
+
+th {
+	background-color: #ddf;
+}
+
+th a {
+	text-decoration: none;
+}
+
+tr:hover {
+	background-color: #ddf;
+}
+
+td {
+	border: 1px solid black;
+	padding: 0.2em;
+	padding-left: 0.3em;
+	padding-right: 0.2em;
+}
+
+/* Navigation bar; tabbed style */
+.nav {
+	height: 2em; margin-bottom:1.2em; position:relative; overflow:hidden;margin-top: -10px;
+}
+
+.nav ul {
+	margin:0; position:absolute; bottom:0; padding-left:0.5em;
+}
+
+.nav li {
+	float:left;
+  	list-style-type:none;
+  	white-space:nowrap;
+  	margin-right:0px;
+  	background:#fff;
+  	position:relative;
+  	margin-bottom:5px;
+}
+
+.nav li a {
+	font-size: 0.8em;
+  	text-decoration:none;
+  	line-height:1.3em;
+ 	padding:2px 6px 2px 6px;
+  	border: 1px solid #ccc;
+  	border-bottom: 1px solid #bbbbbb;
+  	background-color:#FFFFFF;
+  	color:#999;
+  	font-weight:bold;
+  	border-top-left-radius:3px;
+  	border-top-right-radius:3px;
+}
+
+.nav li a:hover {
+	background-color: #cacbcb;
+  	text-decoration:none;
+}
+
+img {
+	border: 1px solid black;
+	padding: 0.5em;
+	background-color: white;
+}
+
+th img {
+	border: 0px;
+	padding: 0px;
+	background-color: #ddf;
+}
+
+h1 a, h2 a {
+	color: black;
+	text-decoration: none;
+}
+
+h1:hover a:after,
+h2:hover a:after {
+	color: #555;
+}
+
+h1 {
+	font-size: x-large;
+}
+
+h2 {
+	background-color: #C6E9F1;
+	border: 1px solid #C6E9F1;
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+	color: black;
+	font-size: 0.8em;
+	clear: both;
+}
+
+h2 a {
+	color: black;
+}
+
+p{
+	font-size: 0.7em;
+}
+
+.moreauthors {
+	font-size: 70%;
+}
--- a/public/statistics/trustie2/index.html
+++ b/public/statistics/trustie2/index.html
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<h2>项目信息(Project Information)</h2>
+<dl><dt>项目名(Project name)</dt><dd>trustie2</dd><dt>统计时段(Report Period)</dt><dd>2013-08-01 02:33:49 to 2013-08-23 22:41:30</dd><dt>项目活跃时段(Project Active Period)</dt><dd>2013-08-01 02:33:49 to 2013-08-09 09:24:38 (9 days)</dd>
+<h2><a href="#代码文件信息(files_information_of_code)" name="代码文件信息(files_information_of_code)">代码文件信息(Files Information of Code)</a></h2>
+
+<table class="authors sortable" id="ext"><tr><th>文件类型(File Type)</th><th>文件数(Files Number)</th><th>代码行数(Lines Number of Code)</th></tr><tr><td>.rb</td><td>677</td><td>59777</td></tr><tr><td>.erb</td><td>423</td><td>10688</td></tr><tr><td>.js</td><td>109</td><td>3891</td></tr><tr><td>.yml</td><td>77</td><td>52743</td></tr><tr><td>.css</td><td>23</td><td>5820</td></tr><tr><td>.py</td><td>1</td><td>196</td></tr><tr><td>.c</td><td>0</td><td>0</td></tr><tr><td>.html</td><td>5</td><td>334</td></tr><tr><td>.php</td><td>2</td><td>700</td></tr></table><dt>代码文件总数(Total files number of Code)</dt><dd>1317</dd><dt>代码总数(Total Lines number of Code)</dt><dd>134149</dd><dt>修改代码总数(Total Modified Lines Number of Code)</dt><dd>3197 (5961 added, 2764 removed)</dd>
+<h2><a href="#作者信息(authors_information)" name="作者信息(authors_information)">作者信息(Authors Information)</a></h2>
+
+<table class="authors sortable" id="authors"><tr><th>作者名(Author Name)</th><th>提交次数及占百分比(Commits)(%)</th><th>增加代码行数(+ lines)</th><th>删除代码行数(- lines)</th><th>首次提交日期(First commit)</th><th>最后一次提交日期(Last commit)</th><th class="unsortable">活跃年龄(Age)</th><th>活跃天数(Active days)</th><th>#提交排名(# by commits)</th></tr><tr><td>zhangyang</td><td>27 (26.73%)</td><td>653</td><td>359</td><td>2013-08-01</td><td>2013-08-07</td><td>6 days, 2:35:42</td><td>7</td><td>1</td></tr><tr><td>huangjingquan</td><td>21 (20.79%)</td><td>838</td><td>508</td><td>2013-08-01</td><td>2013-08-09</td><td>8 days, 4:34:48</td><td>8</td><td>2</td></tr><tr><td>nieguanghui</td><td>20 (19.80%)</td><td>1169</td><td>568</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 21:52:06</td><td>7</td><td>3</td></tr><tr><td>fanqiang</td><td>17 (16.83%)</td><td>2467</td><td>1595</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 20:37:38</td><td>9</td><td>4</td></tr><tr><td>william</td><td>9 (8.91%)</td><td>1614</td><td>169</td><td>2013-08-01</td><td>2013-08-08</td><td>7 days, 1:46:54</td><td>4</td><td>5</td></tr><tr><td>kaizheng</td><td>6 (5.94%)</td><td>809</td><td>68</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 20:04:01</td><td>4</td><td>6</td></tr><tr><td>wanglinchun</td><td>1 (0.99%)</td><td>7</td><td>4</td><td>2013-08-07</td><td>2013-08-07</td><td>0:00:00</td><td>1</td><td>7</td></tr></table><dt>作者总数(Authors Number)</dt><dd>7</dd><dt>提交总数(Total Commits Number)</dt><dd>101 (average 11.2 commits per active day, 11.2 per all days)</dd></dl></body>
+</html>
--- a/public/statistics/trustie2/sortable.js
+++ b/public/statistics/trustie2/sortable.js
@ -0,0 +1,324 @@
+/*
+Table sorting script  by Joost de Valk, check it out at http://www.joostdevalk.nl/code/sortable-table/.
+Based on a script from http://www.kryogenix.org/code/browser/sorttable/.
+Distributed under the MIT license: http://www.kryogenix.org/code/browser/licence.html .
+
+Copyright (c) 1997-2007 Stuart Langridge, Joost de Valk.
+
+Version 1.5.7
+*/
+
+/* You can change these values */
+var image_path = "";
+var image_up = "arrow-up.gif";
+var image_down = "arrow-down.gif";
+var image_none = "arrow-none.gif";
+var europeandate = true;
+var alternate_row_colors = true;
+
+/* Don't change anything below this unless you know what you're doing */
+addEvent(window, "load", sortables_init);
+
+var SORT_COLUMN_INDEX;
+var thead = false;
+
+function sortables_init() {
+	// Find all tables with class sortable and make them sortable
+	if (!document.getElementsByTagName) return;
+	tbls = document.getElementsByTagName("table");
+	for (ti=0;ti<tbls.length;ti++) {
+		thisTbl = tbls[ti];
+		if (((' '+thisTbl.className+' ').indexOf("sortable") != -1) && (thisTbl.id)) {
+			ts_makeSortable(thisTbl);
+		}
+	}
+}
+
+function ts_makeSortable(t) {
+	if (t.rows && t.rows.length > 0) {
+		if (t.tHead && t.tHead.rows.length > 0) {
+			var firstRow = t.tHead.rows[t.tHead.rows.length-1];
+			thead = true;
+		} else {
+			var firstRow = t.rows[0];
+		}
+	}
+	if (!firstRow) return;
+	
+	// We have a first row: assume it's the header, and make its contents clickable links
+	for (var i=0;i<firstRow.cells.length;i++) {
+		var cell = firstRow.cells[i];
+		var txt = ts_getInnerText(cell);
+		if (cell.className != "unsortable" && cell.className.indexOf("unsortable") == -1) {
+			cell.innerHTML = '<a href="#" class="sortheader" onclick="ts_resortTable(this, '+i+');return false;">'+txt+'<span class="sortarrow">&nbsp;&nbsp;<img src="'+ image_path + image_none + '" alt="&darr;"/></span></a>';
+		}
+	}
+	if (alternate_row_colors) {
+		alternate(t);
+	}
+}
+
+function ts_getInnerText(el) {
+	if (typeof el == "string") return el;
+	if (typeof el == "undefined") { return el };
+	if (el.innerText) return el.innerText;	//Not needed but it is faster
+	var str = "";
+	
+	var cs = el.childNodes;
+	var l = cs.length;
+	for (var i = 0; i < l; i++) {
+		switch (cs[i].nodeType) {
+			case 1: //ELEMENT_NODE
+				str += ts_getInnerText(cs[i]);
+				break;
+			case 3:	//TEXT_NODE
+				str += cs[i].nodeValue;
+				break;
+		}
+	}
+	return str;
+}
+
+function ts_resortTable(lnk, clid) {
+	var span;
+	for (var ci=0;ci<lnk.childNodes.length;ci++) {
+		if (lnk.childNodes[ci].tagName && lnk.childNodes[ci].tagName.toLowerCase() == 'span') span = lnk.childNodes[ci];
+	}
+	var spantext = ts_getInnerText(span);
+	var td = lnk.parentNode;
+	var column = clid || td.cellIndex;
+	var t = getParent(td,'TABLE');
+	// Work out a type for the column
+	if (t.rows.length <= 1) return;
+	var itm = "";
+	var i = 1;
+	while (itm == "" && i < t.tBodies[0].rows.length) {
+		var itm = ts_getInnerText(t.tBodies[0].rows[i].cells[column]);
+		itm = trim(itm);
+		if (itm.substr(0,4) == "<!--" || itm.length == 0) {
+			itm = "";
+		}
+		i++;
+	}
+	if (itm == "") return; 
+	sortfn = ts_sort_caseinsensitive;
+	if (itm.match(/^\d\d[\/\.-][a-zA-z][a-zA-Z][a-zA-Z][\/\.-]\d\d\d\d$/)) sortfn = ts_sort_date;
+	if (itm.match(/^\d\d[\/\.-]\d\d[\/\.-]\d\d\d{2}?$/)) sortfn = ts_sort_date;
+	if (itm.match(/^-?[£$€Û¢´]\d/)) sortfn = ts_sort_numeric;
+	// ignore stuff in () after the numbers.
+	if (itm.match(/^-?(\d+[,\.]?)+(E[-+][\d]+)?%?( \(.*\))?$/)) sortfn = ts_sort_numeric;
+	SORT_COLUMN_INDEX = column;
+	var firstRow = new Array();
+	var newRows = new Array();
+	for (k=0;k<t.tBodies.length;k++) {
+		for (i=0;i<t.tBodies[k].rows[0].length;i++) { 
+			firstRow[i] = t.tBodies[k].rows[0][i]; 
+		}
+	}
+	for (k=0;k<t.tBodies.length;k++) {
+		if (!thead) {
+			// Skip the first row
+			for (j=1;j<t.tBodies[k].rows.length;j++) { 
+				newRows[j-1] = t.tBodies[k].rows[j];
+			}
+		} else {
+			// Do NOT skip the first row
+			for (j=0;j<t.tBodies[k].rows.length;j++) { 
+				newRows[j] = t.tBodies[k].rows[j];
+			}
+		}
+	}
+	newRows.sort(sortfn);
+	if (span.getAttribute("sortdir") == 'down') {
+			ARROW = '&nbsp;&nbsp;<img src="'+ image_path + image_down + '" alt="&darr;"/>';
+			newRows.reverse();
+			span.setAttribute('sortdir','up');
+	} else {
+			ARROW = '&nbsp;&nbsp;<img src="'+ image_path + image_up + '" alt="&uarr;"/>';
+			span.setAttribute('sortdir','down');
+	} 
+    // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
+    // don't do sortbottom rows
+    for (i=0; i<newRows.length; i++) { 
+		if (!newRows[i].className || (newRows[i].className && (newRows[i].className.indexOf('sortbottom') == -1))) {
+			t.tBodies[0].appendChild(newRows[i]);
+		}
+	}
+    // do sortbottom rows only
+    for (i=0; i<newRows.length; i++) {
+		if (newRows[i].className && (newRows[i].className.indexOf('sortbottom') != -1)) 
+			t.tBodies[0].appendChild(newRows[i]);
+	}
+	// Delete any other arrows there may be showing
+	var allspans = document.getElementsByTagName("span");
+	for (var ci=0;ci<allspans.length;ci++) {
+		if (allspans[ci].className == 'sortarrow') {
+			if (getParent(allspans[ci],"table") == getParent(lnk,"table")) { // in the same table as us?
+				allspans[ci].innerHTML = '&nbsp;&nbsp;<img src="'+ image_path + image_none + '" alt="&darr;"/>';
+			}
+		}
+	}		
+	span.innerHTML = ARROW;
+	alternate(t);
+}
+
+function getParent(el, pTagName) {
+	if (el == null) {
+		return null;
+	} else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase()) {
+		return el;
+	} else {
+		return getParent(el.parentNode, pTagName);
+	}
+}
+
+function sort_date(date) {	
+	// y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
+	dt = "00000000";
+	if (date.length == 11) {
+		mtstr = date.substr(3,3);
+		mtstr = mtstr.toLowerCase();
+		switch(mtstr) {
+			case "jan": var mt = "01"; break;
+			case "feb": var mt = "02"; break;
+			case "mar": var mt = "03"; break;
+			case "apr": var mt = "04"; break;
+			case "may": var mt = "05"; break;
+			case "jun": var mt = "06"; break;
+			case "jul": var mt = "07"; break;
+			case "aug": var mt = "08"; break;
+			case "sep": var mt = "09"; break;
+			case "oct": var mt = "10"; break;
+			case "nov": var mt = "11"; break;
+			case "dec": var mt = "12"; break;
+			// default: var mt = "00";
+		}
+		dt = date.substr(7,4)+mt+date.substr(0,2);
+		return dt;
+	} else if (date.length == 10) {
+		if (europeandate == false) {
+			dt = date.substr(6,4)+date.substr(0,2)+date.substr(3,2);
+			return dt;
+		} else {
+			dt = date.substr(6,4)+date.substr(3,2)+date.substr(0,2);
+			return dt;
+		}
+	} else if (date.length == 8) {
+		yr = date.substr(6,2);
+		if (parseInt(yr) < 50) { 
+			yr = '20'+yr; 
+		} else { 
+			yr = '19'+yr; 
+		}
+		if (europeandate == true) {
+			dt = yr+date.substr(3,2)+date.substr(0,2);
+			return dt;
+		} else {
+			dt = yr+date.substr(0,2)+date.substr(3,2);
+			return dt;
+		}
+	}
+	return dt;
+}
+
+function ts_sort_date(a,b) {
+	dt1 = sort_date(ts_getInnerText(a.cells[SORT_COLUMN_INDEX]));
+	dt2 = sort_date(ts_getInnerText(b.cells[SORT_COLUMN_INDEX]));
+	
+	if (dt1==dt2) {
+		return 0;
+	}
+	if (dt1<dt2) { 
+		return -1;
+	}
+	return 1;
+}
+function ts_sort_numeric(a,b) {
+	var aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
+	aa = clean_num(aa);
+	var bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
+	bb = clean_num(bb);
+	return compare_numeric(aa,bb);
+}
+function compare_numeric(a,b) {
+	var a = parseFloat(a);
+	a = (isNaN(a) ? 0 : a);
+	var b = parseFloat(b);
+	b = (isNaN(b) ? 0 : b);
+	return a - b;
+}
+function ts_sort_caseinsensitive(a,b) {
+	aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).toLowerCase();
+	bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).toLowerCase();
+	if (aa==bb) {
+		return 0;
+	}
+	if (aa<bb) {
+		return -1;
+	}
+	return 1;
+}
+function ts_sort_default(a,b) {
+	aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
+	bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
+	if (aa==bb) {
+		return 0;
+	}
+	if (aa<bb) {
+		return -1;
+	}
+	return 1;
+}
+function addEvent(elm, evType, fn, useCapture)
+// addEvent and removeEvent
+// cross-browser event handling for IE5+,	NS6 and Mozilla
+// By Scott Andrew
+{
+	if (elm.addEventListener){
+		elm.addEventListener(evType, fn, useCapture);
+		return true;
+	} else if (elm.attachEvent){
+		var r = elm.attachEvent("on"+evType, fn);
+		return r;
+	} else {
+		alert("Handler could not be removed");
+	}
+}
+function clean_num(str) {
+	str = str.replace(new RegExp(/[^-?0-9.]/g),"");
+	return str;
+}
+function trim(s) {
+	return s.replace(/^\s+|\s+$/g, "");
+}
+function alternate(table) {
+	// Take object table and get all it's tbodies.
+	var tableBodies = table.getElementsByTagName("tbody");
+	// Loop through these tbodies
+	for (var i = 0; i < tableBodies.length; i++) {
+		// Take the tbody, and get all it's rows
+		var tableRows = tableBodies[i].getElementsByTagName("tr");
+		// Loop through these rows
+		// Start at 1 because we want to leave the heading row untouched
+		for (var j = 0; j < tableRows.length; j++) {
+			// Check if j is even, and apply classes for both possible results
+			if ( (j % 2) == 0  ) {
+				if ( !(tableRows[j].className.indexOf('odd') == -1) ) {
+					tableRows[j].className = tableRows[j].className.replace('odd', 'even');
+				} else {
+					if ( tableRows[j].className.indexOf('even') == -1 ) {
+						tableRows[j].className += " even";
+					}
+				}
+			} else {
+				if ( !(tableRows[j].className.indexOf('even') == -1) ) {
+					tableRows[j].className = tableRows[j].className.replace('even', 'odd');
+				} else {
+					if ( tableRows[j].className.indexOf('odd') == -1 ) {
+						tableRows[j].className += " odd";
+					}
+				}
+			} 
+		}
+	}
+}
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@ -1418,13 +1418,13 @@ p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
  margin-bottom:5px;
 }
 #content .tabs ul li a{
-  font-size: 0.9em;
+  font-size: 13px;
  text-decoration:none;
  line-height:1.3em;
  padding:2px 6px 2px 6px;
  border: 1px solid #ccc;
  border-bottom: 1px solid #bbbbbb;
-  background-color:#DEEBF0;
+  background-color:#FFFFFF;
  color:#999;
  font-weight:bold;
  border-top-left-radius:3px;
@ -1485,7 +1485,7 @@ button.tab-right {
 }
 #content .tabs_new ul li a{
  display:block;
-  font-size: 0.9em;
+  font-size: 13px;
  text-decoration:none;
  line-height:1.3em;
  padding:4px 6px 4px 6px;
--- a/statistics/trustie2/trustie/activity.html
+++ b/statistics/trustie2/trustie/activity.html
@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<div class="nav">
+<ul>
+<li><a href="index.html">一般(General)</a></li>
+<li><a href="activity.html">活动(Activity)</a></li>
+<li><a href="authors.html">作者(Authors)</a></li>
+<li><a href="files.html">文件(Files)</a></li>
+<li><a href="tags.html">里程碑(Tags)</a></li>
+</ul>
+</div>
+
+<h2><a href="#周活动(weekly_activity)" name="周活动(weekly_activity)">周活动(Weekly activity)</a></h2>
+
+<p>前24周(Last 24 weeks)</p><table class="noborders"><tr><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">48<div style="display: block; background-color: red; width: 20px; height: 181px"></div></td><td style="text-align: center; vertical-align: bottom">53<div style="display: block; background-color: red; width: 20px; height: 200px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td></tr><tr><td>24</td><td>23</td><td>22</td><td>21</td><td>20</td><td>19</td><td>18</td><td>17</td><td>16</td><td>15</td><td>14</td><td>13</td><td>12</td><td>11</td><td>10</td><td>9</td><td>8</td><td>7</td><td>6</td><td>5</td><td>4</td><td>3</td><td>2</td><td>1</td></tr></table>
+<h2><a href="#每天时统计(hour_of_day)" name="每天时统计(hour_of_day)">每天时统计(Hour of Day)</a></h2>
+
+<table><tr><th>Hour</th><th>0</th><th>1</th><th>2</th><th>3</th><th>4</th><th>5</th><th>6</th><th>7</th><th>8</th><th>9</th><th>10</th><th>11</th><th>12</th><th>13</th><th>14</th><th>15</th><th>16</th><th>17</th><th>18</th><th>19</th><th>20</th><th>21</th><th>22</th><th>23</th></tr>
+<tr><th>Commits</th><td style="background-color: rgb(172, 0, 0)">6</td><td style="background-color: rgb(172, 0, 0)">6</td><td style="background-color: rgb(255, 0, 0)">17</td><td style="background-color: rgb(194, 0, 0)">9</td><td>0</td><td>0</td><td style="background-color: rgb(134, 0, 0)">1</td><td style="background-color: rgb(157, 0, 0)">4</td><td style="background-color: rgb(187, 0, 0)">8</td><td style="background-color: rgb(172, 0, 0)">6</td><td>0</td><td style="background-color: rgb(157, 0, 0)">4</td><td style="background-color: rgb(232, 0, 0)">14</td><td style="background-color: rgb(202, 0, 0)">10</td><td style="background-color: rgb(247, 0, 0)">16</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+<tr><th>%</th><td style="background-color: rgb(172, 0, 0)">5.94</td><td style="background-color: rgb(172, 0, 0)">5.94</td><td style="background-color: rgb(255, 0, 0)">16.83</td><td style="background-color: rgb(194, 0, 0)">8.91</td><td>0.00</td><td>0.00</td><td style="background-color: rgb(134, 0, 0)">0.99</td><td style="background-color: rgb(157, 0, 0)">3.96</td><td style="background-color: rgb(187, 0, 0)">7.92</td><td style="background-color: rgb(172, 0, 0)">5.94</td><td>0.00</td><td style="background-color: rgb(157, 0, 0)">3.96</td><td style="background-color: rgb(232, 0, 0)">13.86</td><td style="background-color: rgb(202, 0, 0)">9.90</td><td style="background-color: rgb(247, 0, 0)">15.84</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td></tr></table><img src="hour_of_day.svg" alt="Hour of Day" />
+<h2><a href="#每周天统计(day_of_week)" name="每周天统计(day_of_week)">每周天统计(Day of Week)</a></h2>
+
+<div class="vtable"><table><tr><th>Day</th><th>Total (%)</th></tr><tr><th>1</th><td>4 (3.96%)</td></tr><tr><th>2</th><td>15 (14.85%)</td></tr><tr><th>3</th><td>11 (10.89%)</td></tr><tr><th>4</th><td>34 (33.66%)</td></tr><tr><th>5</th><td>18 (17.82%)</td></tr><tr><th>6</th><td>9 (8.91%)</td></tr><tr><th>7</th><td>10 (9.90%)</td></tr></table></div><img src="day_of_week.svg" alt="Day of Week" />
+<h2><a href="#每周时统计(hour_of_week)" name="每周时统计(hour_of_week)">每周时统计(Hour of Week)</a></h2>
+
+<table><tr><th>Weekday</th><th>0</th><th>1</th><th>2</th><th>3</th><th>4</th><th>5</th><th>6</th><th>7</th><th>8</th><th>9</th><th>10</th><th>11</th><th>12</th><th>13</th><th>14</th><th>15</th><th>16</th><th>17</th><th>18</th><th>19</th><th>20</th><th>21</th><th>22</th><th>23</th></tr><tr><th>1</th><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>2</th><td></td><td></td><td style="background-color: rgb(183, 0, 0)">4</td><td></td><td></td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(169, 0, 0)">3</td><td></td><td></td><td></td><td style="background-color: rgb(169, 0, 0)">3</td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(155, 0, 0)">2</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>3</th><td></td><td style="background-color: rgb(155, 0, 0)">2</td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(155, 0, 0)">2</td><td></td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(155, 0, 0)">2</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>4</th><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(198, 0, 0)">5</td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td></td><td></td><td style="background-color: rgb(169, 0, 0)">3</td><td></td><td style="background-color: rgb(169, 0, 0)">3</td><td style="background-color: rgb(255, 0, 0)">9</td><td style="background-color: rgb(198, 0, 0)">5</td><td style="background-color: rgb(226, 0, 0)">7</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>5</th><td style="background-color: rgb(169, 0, 0)">3</td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(198, 0, 0)">5</td><td style="background-color: rgb(183, 0, 0)">4</td><td></td><td></td><td></td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>6</th><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(183, 0, 0)">4</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>7</th><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(169, 0, 0)">3</td><td style="background-color: rgb(155, 0, 0)">2</td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr></table>
+<h2><a href="#每年月统计(month_of_year)" name="每年月统计(month_of_year)">每年月统计(Month of Year)</a></h2>
+
+<div class="vtable"><table><tr><th>Month</th><th>Commits (%)</th></tr><tr><td>1</td><td>0 (0.00 %)</td></tr><tr><td>2</td><td>0 (0.00 %)</td></tr><tr><td>3</td><td>0 (0.00 %)</td></tr><tr><td>4</td><td>0 (0.00 %)</td></tr><tr><td>5</td><td>0 (0.00 %)</td></tr><tr><td>6</td><td>0 (0.00 %)</td></tr><tr><td>7</td><td>0 (0.00 %)</td></tr><tr><td>8</td><td>101 (100.00 %)</td></tr><tr><td>9</td><td>0 (0.00 %)</td></tr><tr><td>10</td><td>0 (0.00 %)</td></tr><tr><td>11</td><td>0 (0.00 %)</td></tr><tr><td>12</td><td>0 (0.00 %)</td></tr></table></div><img src="month_of_year.svg" alt="Month of Year" />
+<h2><a href="#提交统计（年/月）commits_by_year/month" name="提交统计（年/月）commits_by_year/month">提交统计（年/月）Commits by year/month</a></h2>
+
+<div class="vtable"><table><tr><th>Month</th><th>Commits</th></tr><tr><td>2013-08</td><td>101</td></tr></table></div><img src="commits_by_year_month.svg" alt="Commits by year/month" />
+<h2><a href="#提交统计（年）(commits_by_year)" name="提交统计（年）(commits_by_year)">提交统计（年）(Commits by Year)</a></h2>
+
+<div class="vtable"><table><tr><th>Year</th><th>Commits (% of all)</th></tr><tr><td>2013</td><td>101 (100.00%)</td></tr></table></div><img src="commits_by_year.svg" alt="Commits by Year" />
+<h2><a href="#提交统计（时区）commits_by_timezone" name="提交统计（时区）commits_by_timezone">提交统计（时区）Commits by Timezone</a></h2>
+
+<table><tr><th>Timezone</th><th>Commits</th><tr><th>+0800</th><td style="background-color: rgb(255, 0, 0)">101</td></tr></tr></table></body></html>
--- a/statistics/trustie2/trustie/arrow-down.gif
+++ b/statistics/trustie2/trustie/arrow-down.gif
--- a/statistics/trustie2/trustie/arrow-none.gif
+++ b/statistics/trustie2/trustie/arrow-none.gif
--- a/statistics/trustie2/trustie/arrow-up.gif
+++ b/statistics/trustie2/trustie/arrow-up.gif
--- a/statistics/trustie2/trustie/authors.html
+++ b/statistics/trustie2/trustie/authors.html
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<div class="nav">
+<ul>
+<li><a href="index.html">一般(General)</a></li>
+<li><a href="activity.html">活动(Activity)</a></li>
+<li><a href="authors.html">作者(Authors)</a></li>
+<li><a href="files.html">文件(Files)</a></li>
+<li><a href="tags.html">里程碑(Tags)</a></li>
+</ul>
+</div>
+
+<h2><a href="#作者列表(list_of_authors)" name="作者列表(list_of_authors)">作者列表(List of Authors)</a></h2>
+
+<table class="authors sortable" id="authors"><tr><th>Author</th><th>Commits (%)</th><th>+ lines</th><th>- lines</th><th>First commit</th><th>Last commit</th><th class="unsortable">Age</th><th>Active days</th><th># by commits</th></tr><tr><td>zhangyang</td><td>27 (26.73%)</td><td>653</td><td>359</td><td>2013-08-01</td><td>2013-08-07</td><td>6 days, 2:35:42</td><td>7</td><td>1</td></tr><tr><td>huangjingquan</td><td>21 (20.79%)</td><td>838</td><td>508</td><td>2013-08-01</td><td>2013-08-09</td><td>8 days, 4:34:48</td><td>8</td><td>2</td></tr><tr><td>nieguanghui</td><td>20 (19.80%)</td><td>1169</td><td>568</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 21:52:06</td><td>7</td><td>3</td></tr><tr><td>fanqiang</td><td>17 (16.83%)</td><td>2467</td><td>1595</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 20:37:38</td><td>9</td><td>4</td></tr><tr><td>william</td><td>9 (8.91%)</td><td>1614</td><td>169</td><td>2013-08-01</td><td>2013-08-08</td><td>7 days, 1:46:54</td><td>4</td><td>5</td></tr><tr><td>kaizheng</td><td>6 (5.94%)</td><td>809</td><td>68</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 20:04:01</td><td>4</td><td>6</td></tr><tr><td>wanglinchun</td><td>1 (0.99%)</td><td>7</td><td>4</td><td>2013-08-07</td><td>2013-08-07</td><td>0:00:00</td><td>1</td><td>7</td></tr></table>
+<h2><a href="#月最佳作者(author_of_month)" name="月最佳作者(author_of_month)">月最佳作者(Author of Month)</a></h2>
+
+<table class="sortable" id="aom"><tr><th>Month</th><th>Author</th><th>Commits (%)</th><th class="unsortable">Next top 5</th></tr><tr><td>2013-08</td><td>zhangyang</td><td>27 (26.73% of 101)</td><td>huangjingquan, nieguanghui, fanqiang, william</td></tr></table>
+<h2><a href="#年最佳作者(author_of_year)" name="年最佳作者(author_of_year)">年最佳作者(Author of Year)</a></h2>
+
+<table class="sortable" id="aoy"><tr><th>Year</th><th>Author</th><th>Commits (%)</th><th class="unsortable">Next top 5</th></tr><tr><td>2013</td><td>zhangyang</td><td>27 (26.73% of 101)</td><td>huangjingquan, nieguanghui, fanqiang, william</td></tr></table>
+<h2><a href="#提交统计（邮箱）commits_by_domains" name="提交统计（邮箱）commits_by_domains">提交统计（邮箱）Commits by Domains</a></h2>
+
+<div class="vtable"><table><tr><th>Domains</th><th>Total (%)</th></tr><tr><th>gmail.com</th><td>56 (55.45%)</td></tr><tr><th>163.com</th><td>28 (27.72%)</td></tr><tr><th>qq.com</th><td>17 (16.83%)</td></tr></table></div><img src="domains.svg" alt="Commits by Domains" /></body></html>
--- a/statistics/trustie2/trustie/commits_by_year.dat
+++ b/statistics/trustie2/trustie/commits_by_year.dat
@ -0,0 +1 @@
+2013 101
--- a/statistics/trustie2/trustie/commits_by_year.plot
+++ b/statistics/trustie2/trustie/commits_by_year.plot
@ -0,0 +1,10 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'commits_by_year.svg'
+unset key
+set xtics 1 rotate by 90
+set grid y
+set ylabel "Commits"
+set yrange [0:]
+plot 'commits_by_year.dat' using 1:2:(0.5) w boxes fs solid
--- a/statistics/trustie2/trustie/commits_by_year.svg
+++ b/statistics/trustie2/trustie/commits_by_year.svg
@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,444.0 L575.0,444.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,444.0 L80.9,444.0 M575.0,444.0 L566.0,444.0  h0.01'/>	<g transform="translate(63.6,448.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 0</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,380.8 L575.0,380.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,380.8 L80.9,380.8 M575.0,380.8 L566.0,380.8  h0.01'/>	<g transform="translate(63.6,385.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 20</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,317.6 L575.0,317.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,317.6 L80.9,317.6 M575.0,317.6 L566.0,317.6  h0.01'/>	<g transform="translate(63.6,322.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 40</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,254.3 L575.0,254.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,254.3 L80.9,254.3 M575.0,254.3 L566.0,254.3  h0.01'/>	<g transform="translate(63.6,258.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 60</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,191.1 L575.0,191.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,191.1 L80.9,191.1 M575.0,191.1 L566.0,191.1  h0.01'/>	<g transform="translate(63.6,195.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 80</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,127.9 L575.0,127.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,127.9 L80.9,127.9 M575.0,127.9 L566.0,127.9  h0.01'/>	<g transform="translate(63.6,132.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 100</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,64.7 L80.9,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(63.6,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 120</text>
+	</g>
+	<path stroke='black'  d='M71.9,444.0 L71.9,435.0 M71.9,64.7 L71.9,73.7  h0.01'/>	<g transform="translate(76.4,452.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text> 2012</text>
+	</g>
+	<path stroke='black'  d='M323.5,444.0 L323.5,435.0 M323.5,64.7 L323.5,73.7  h0.01'/>	<g transform="translate(328.0,452.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text> 2013</text>
+	</g>
+	<path stroke='black'  d='M575.0,444.0 L575.0,435.0 M575.0,64.7 L575.0,73.7  h0.01'/>	<g transform="translate(579.5,452.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text> 2014</text>
+	</g>
+	<path stroke='black'  d='M71.9,64.7 L71.9,444.0 L575.0,444.0 L575.0,64.7 L71.9,64.7 Z  h0.01'/>	<g transform="translate(17.6,254.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Commits</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '260.6,444.0 386.4,444.0 386.4,124.7 260.6,124.7 '/>
+	</g>
+	<path stroke='red'  d='M260.6,444.0 L260.6,124.8 L386.3,124.8 L386.3,444.0 L260.6,444.0 Z  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,64.7 L71.9,444.0 L575.0,444.0 L575.0,64.7 L71.9,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
--- a/statistics/trustie2/trustie/commits_by_year_month.dat
+++ b/statistics/trustie2/trustie/commits_by_year_month.dat
@ -0,0 +1 @@
+2013-08 101
--- a/statistics/trustie2/trustie/commits_by_year_month.plot
+++ b/statistics/trustie2/trustie/commits_by_year_month.plot
@ -0,0 +1,13 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'commits_by_year_month.svg'
+unset key
+set xdata time
+set timefmt "%Y-%m"
+set format x "%Y-%m"
+set xtics rotate by 90 15768000
+set bmargin 5
+set grid y
+set ylabel "Commits"
+plot 'commits_by_year_month.dat' using 1:2:(0.5) w boxes fs solid
--- a/statistics/trustie2/trustie/commits_by_year_month.svg
+++ b/statistics/trustie2/trustie/commits_by_year_month.svg
@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,390.0 L575.0,390.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,390.0 L97.5,390.0 M575.0,390.0 L566.0,390.0  h0.01'/>	<g transform="translate(80.2,394.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 99.5</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,335.8 L575.0,335.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,335.8 L97.5,335.8 M575.0,335.8 L566.0,335.8  h0.01'/>	<g transform="translate(80.2,340.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 100</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,281.6 L575.0,281.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,281.6 L97.5,281.6 M575.0,281.6 L566.0,281.6  h0.01'/>	<g transform="translate(80.2,286.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 100.5</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,227.3 L575.0,227.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,227.3 L97.5,227.3 M575.0,227.3 L566.0,227.3  h0.01'/>	<g transform="translate(80.2,231.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 101</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,173.1 L575.0,173.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,173.1 L97.5,173.1 M575.0,173.1 L566.0,173.1  h0.01'/>	<g transform="translate(80.2,177.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 101.5</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,118.9 L575.0,118.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,118.9 L97.5,118.9 M575.0,118.9 L566.0,118.9  h0.01'/>	<g transform="translate(80.2,123.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 102</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,64.7 L97.5,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(80.2,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 102.5</text>
+	</g>
+	<path stroke='black'  d='M96.3,390.0 L96.3,381.0 M96.3,64.7 L96.3,73.7  h0.01'/>	<g transform="translate(100.8,398.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-07</text>
+	</g>
+	<path stroke='black'  d='M175.7,390.0 L175.7,385.5 M175.7,64.7 L175.7,69.2 M255.1,390.0 L255.1,385.5 M255.1,64.7 L255.1,69.2 
+		M334.5,390.0 L334.5,385.5 M334.5,64.7 L334.5,69.2 M413.9,390.0 L413.9,385.5 M413.9,64.7 L413.9,69.2 
+		M493.3,390.0 L493.3,385.5 M493.3,64.7 L493.3,69.2 M575.0,390.0 L575.0,381.0 M575.0,64.7 L575.0,73.7 
+		 h0.01'/>	<g transform="translate(579.5,398.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2014-01</text>
+	</g>
+	<path stroke='black'  d='M88.5,64.7 L88.5,390.0 L575.0,390.0 L575.0,64.7 L88.5,64.7 Z  h0.01'/>	<g transform="translate(17.6,227.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Commits</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '175.9,390.0 176.0,390.0 176.0,227.2 175.9,227.2 '/>
+	</g>
+	<path stroke='red'  d='M175.9,390.0 L175.9,227.3 L175.9,390.0 Z  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,64.7 L88.5,390.0 L575.0,390.0 L575.0,64.7 L88.5,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
--- a/statistics/trustie2/trustie/day_of_week.dat
+++ b/statistics/trustie2/trustie/day_of_week.dat
@ -0,0 +1,7 @@
+1 4
+2 15
+3 11
+4 34
+5 18
+6 9
+7 10
--- a/statistics/trustie2/trustie/day_of_week.plot
+++ b/statistics/trustie2/trustie/day_of_week.plot
@ -0,0 +1,10 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'day_of_week.svg'
+unset key
+set xrange [0.5:7.5]
+set xtics 1
+set grid y
+set ylabel "Commits"
+plot 'day_of_week.dat' using 1:2:(0.5) w boxes fs solid
--- a/statistics/trustie2/trustie/day_of_week.svg
+++ b/statistics/trustie2/trustie/day_of_week.svg
@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,444.0 L575.0,444.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,444.0 L72.6,444.0 M575.0,444.0 L566.0,444.0  h0.01'/>	<g transform="translate(55.3,448.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 0</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,389.8 L575.0,389.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,389.8 L72.6,389.8 M575.0,389.8 L566.0,389.8  h0.01'/>	<g transform="translate(55.3,394.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 5</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,335.6 L575.0,335.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,335.6 L72.6,335.6 M575.0,335.6 L566.0,335.6  h0.01'/>	<g transform="translate(55.3,340.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 10</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,281.4 L575.0,281.4  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,281.4 L72.6,281.4 M575.0,281.4 L566.0,281.4  h0.01'/>	<g transform="translate(55.3,285.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 15</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,227.3 L575.0,227.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,227.3 L72.6,227.3 M575.0,227.3 L566.0,227.3  h0.01'/>	<g transform="translate(55.3,231.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 20</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,173.1 L575.0,173.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,173.1 L72.6,173.1 M575.0,173.1 L566.0,173.1  h0.01'/>	<g transform="translate(55.3,177.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 25</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,118.9 L575.0,118.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,118.9 L72.6,118.9 M575.0,118.9 L566.0,118.9  h0.01'/>	<g transform="translate(55.3,123.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 30</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,64.7 L72.6,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(55.3,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 35</text>
+	</g>
+	<path stroke='black'  d='M100.1,444.0 L100.1,435.0 M100.1,64.7 L100.1,73.7  h0.01'/>	<g transform="translate(100.1,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 1</text>
+	</g>
+	<path stroke='black'  d='M173.2,444.0 L173.2,435.0 M173.2,64.7 L173.2,73.7  h0.01'/>	<g transform="translate(173.2,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 2</text>
+	</g>
+	<path stroke='black'  d='M246.2,444.0 L246.2,435.0 M246.2,64.7 L246.2,73.7  h0.01'/>	<g transform="translate(246.2,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 3</text>
+	</g>
+	<path stroke='black'  d='M319.3,444.0 L319.3,435.0 M319.3,64.7 L319.3,73.7  h0.01'/>	<g transform="translate(319.3,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 4</text>
+	</g>
+	<path stroke='black'  d='M392.4,444.0 L392.4,435.0 M392.4,64.7 L392.4,73.7  h0.01'/>	<g transform="translate(392.4,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 5</text>
+	</g>
+	<path stroke='black'  d='M465.4,444.0 L465.4,435.0 M465.4,64.7 L465.4,73.7  h0.01'/>	<g transform="translate(465.4,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 6</text>
+	</g>
+	<path stroke='black'  d='M538.5,444.0 L538.5,435.0 M538.5,64.7 L538.5,73.7  h0.01'/>	<g transform="translate(538.5,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 7</text>
+	</g>
+	<path stroke='black'  d='M63.6,64.7 L63.6,444.0 L575.0,444.0 L575.0,64.7 L63.6,64.7 Z  h0.01'/>	<g transform="translate(17.6,254.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Commits</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '81.9,444.0 118.5,444.0 118.5,400.6 81.9,400.6 '/>
+	</g>
+	<path stroke='red'  d='M81.9,444.0 L81.9,400.7 L118.4,400.7 L118.4,444.0 L81.9,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '154.9,444.0 191.6,444.0 191.6,281.3 154.9,281.3 '/>
+	</g>
+	<path stroke='red'  d='M154.9,444.0 L154.9,281.4 L191.5,281.4 L191.5,444.0 L154.9,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '228.0,444.0 264.6,444.0 264.6,324.7 228.0,324.7 '/>
+	</g>
+	<path stroke='red'  d='M228.0,444.0 L228.0,324.8 L264.5,324.8 L264.5,444.0 L228.0,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '301.0,444.0 337.7,444.0 337.7,75.4 301.0,75.4 '/>
+	</g>
+	<path stroke='red'  d='M301.0,444.0 L301.0,75.5 L337.6,75.5 L337.6,444.0 L301.0,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '374.1,444.0 410.7,444.0 410.7,248.8 374.1,248.8 '/>
+	</g>
+	<path stroke='red'  d='M374.1,444.0 L374.1,248.9 L410.6,248.9 L410.6,444.0 L374.1,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '447.2,444.0 483.8,444.0 483.8,346.4 447.2,346.4 '/>
+	</g>
+	<path stroke='red'  d='M447.2,444.0 L447.2,346.5 L483.7,346.5 L483.7,444.0 L447.2,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '520.2,444.0 556.8,444.0 556.8,335.5 520.2,335.5 '/>
+	</g>
+	<path stroke='red'  d='M520.2,444.0 L520.2,335.6 L556.7,335.6 L556.7,444.0 L520.2,444.0 Z  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,64.7 L63.6,444.0 L575.0,444.0 L575.0,64.7 L63.6,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
--- a/statistics/trustie2/trustie/domains.dat
+++ b/statistics/trustie2/trustie/domains.dat
@ -0,0 +1,3 @@
+gmail.com 1 56
+163.com 2 28
+qq.com 3 17
--- a/statistics/trustie2/trustie/domains.plot
+++ b/statistics/trustie2/trustie/domains.plot
@ -0,0 +1,9 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'domains.svg'
+unset key
+unset xtics
+set grid y
+set ylabel "Commits"
+plot 'domains.dat' using 2:3:(0.5) with boxes fs solid, '' using 2:3:1 with labels rotate by 45 offset 0,1
--- a/statistics/trustie2/trustie/domains.svg
+++ b/statistics/trustie2/trustie/domains.svg
@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,463.4 L575.0,463.4  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,463.4 L72.6,463.4 M575.0,463.4 L566.0,463.4  h0.01'/>	<g transform="translate(55.3,467.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 15</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,419.1 L575.0,419.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,419.1 L72.6,419.1 M575.0,419.1 L566.0,419.1  h0.01'/>	<g transform="translate(55.3,423.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 20</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,374.8 L575.0,374.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,374.8 L72.6,374.8 M575.0,374.8 L566.0,374.8  h0.01'/>	<g transform="translate(55.3,379.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 25</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,330.5 L575.0,330.5  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,330.5 L72.6,330.5 M575.0,330.5 L566.0,330.5  h0.01'/>	<g transform="translate(55.3,335.0)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 30</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,286.2 L575.0,286.2  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,286.2 L72.6,286.2 M575.0,286.2 L566.0,286.2  h0.01'/>	<g transform="translate(55.3,290.7)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 35</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,241.9 L575.0,241.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,241.9 L72.6,241.9 M575.0,241.9 L566.0,241.9  h0.01'/>	<g transform="translate(55.3,246.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 40</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,197.6 L575.0,197.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,197.6 L72.6,197.6 M575.0,197.6 L566.0,197.6  h0.01'/>	<g transform="translate(55.3,202.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 45</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,153.3 L575.0,153.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,153.3 L72.6,153.3 M575.0,153.3 L566.0,153.3  h0.01'/>	<g transform="translate(55.3,157.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 50</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,109.0 L575.0,109.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,109.0 L72.6,109.0 M575.0,109.0 L566.0,109.0  h0.01'/>	<g transform="translate(55.3,113.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 55</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,64.7 L72.6,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(55.3,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 60</text>
+	</g>
+	<path stroke='black'  d='M63.6,64.7 L63.6,463.4 L575.0,463.4 L575.0,64.7 L63.6,64.7 Z  h0.01'/>	<g transform="translate(17.6,264.1) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Commits</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '106.2,463.4 191.6,463.4 191.6,100.0 106.2,100.0 '/>
+	</g>
+	<path stroke='red'  d='M106.2,463.4 L106.2,100.1 L191.5,100.1 L191.5,463.4 L106.2,463.4 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '276.7,463.4 362.0,463.4 362.0,348.1 276.7,348.1 '/>
+	</g>
+	<path stroke='red'  d='M276.7,463.4 L276.7,348.2 L361.9,348.2 L361.9,463.4 L276.7,463.4 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '447.2,463.4 532.5,463.4 532.5,445.6 447.2,445.6 '/>
+	</g>
+	<path stroke='red'  d='M447.2,463.4 L447.2,445.7 L532.4,445.7 L532.4,463.4 L447.2,463.4 Z  h0.01'/></g>
+	</g>
+	<g id="gnuplot_plot_2" ><title>gnuplot_plot_2</title>
+<g style="fill:none; color:green; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g transform="translate(153.3,82.1) rotate(-45)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>gmail.com</text>
+	</g>
+	<g transform="translate(323.8,330.2) rotate(-45)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>163.com</text>
+	</g>
+	<g transform="translate(494.3,427.7) rotate(-45)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>qq.com</text>
+	</g>
+</g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,64.7 L63.6,463.4 L575.0,463.4 L575.0,64.7 L63.6,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
--- a/statistics/trustie2/trustie/files.html
+++ b/statistics/trustie2/trustie/files.html
@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<div class="nav">
+<ul>
+<li><a href="index.html">一般(General)</a></li>
+<li><a href="activity.html">活动(Activity)</a></li>
+<li><a href="authors.html">作者(Authors)</a></li>
+<li><a href="files.html">文件(Files)</a></li>
+<li><a href="tags.html">里程碑(Tags)</a></li>
+</ul>
+</div>
+<dl>
+<dt>文件总数(Total files)</dt><dd>1848</dd><dt>代码总行数(Total Lines of Code)</dt><dd>193300</dd><dt>修改代码行数(Total Modified lines)</dt><dd>3197</dd><dt>平均文件大小(Average file size)</dt><dd>173.00 bytes</dd></dl>
+
+<h2><a href="#文件数目统计(file_count_by_date)" name="文件数目统计(file_count_by_date)">文件数目统计(File count by date)</a></h2>
+
+<img src="files_by_date.svg" alt="Files by Date" />
+<h2><a href="#代码行数统计(lines_of_code)" name="代码行数统计(lines_of_code)">代码行数统计(Lines of Code)</a></h2>
+
+<img src="lines_of_code.svg" />
+<h2><a href="#文件信息统计(file_information)" name="文件信息统计(file_information)">文件信息统计(File information)</a></h2>
+
+<table class="sortable" id="ext"><tr><th>Type</th><th>Files (%)</th><th>Lines (%)</th><th>Lines/file</th></tr><tr><td></td><td>72 (3.90%)</td><td>13511 (422.61%)</td><td>187</td></tr><tr><td>15/AUTHORS</td><td>1 (0.05%)</td><td>38 (1.19%)</td><td>38</td></tr><tr><td>15/BUGS</td><td>1 (0.05%)</td><td>3 (0.09%)</td><td>3</td></tr><tr><td>15/LICENSE</td><td>1 (0.05%)</td><td>98 (3.07%)</td><td>98</td></tr><tr><td>15/NEWS</td><td>1 (0.05%)</td><td>789 (24.68%)</td><td>789</td></tr><tr><td>15/README</td><td>1 (0.05%)</td><td>59 (1.85%)</td><td>59</td></tr><tr><td>TXT</td><td>4 (0.22%)</td><td>327 (10.23%)</td><td>81</td></tr><tr><td>autotest</td><td>1 (0.05%)</td><td>12 (0.38%)</td><td>12</td></tr><tr><td>builder</td><td>2 (0.11%)</td><td>61 (1.91%)</td><td>30</td></tr><tr><td>conf</td><td>1 (0.05%)</td><td>32 (1.00%)</td><td>32</td></tr><tr><td>css</td><td>23 (1.24%)</td><td>6761 (211.48%)</td><td>293</td></tr><tr><td>db</td><td>1 (0.05%)</td><td>578 (18.08%)</td><td>578</td></tr><tr><td>eot</td><td>1 (0.05%)</td><td>127 (3.97%)</td><td>127</td></tr><tr><td>erb</td><td>422 (22.84%)</td><td>11803 (369.19%)</td><td>27</td></tr><tr><td>example</td><td>5 (0.27%)</td><td>337 (10.54%)</td><td>67</td></tr><tr><td>exe</td><td>1 (0.05%)</td><td>1972 (61.68%)</td><td>1972</td></tr><tr><td>gemfile</td><td>2 (0.11%)</td><td>14 (0.44%)</td><td>7</td></tr><tr><td>gemspec</td><td>3 (0.16%)</td><td>82 (2.56%)</td><td>27</td></tr><tr><td>gif</td><td>16 (0.87%)</td><td>603 (18.86%)</td><td>37</td></tr><tr><td>gitignore</td><td>2 (0.11%)</td><td>22 (0.69%)</td><td>11</td></tr><tr><td>html</td><td>5 (0.27%)</td><td>419 (13.11%)</td><td>83</td></tr><tr><td>ico</td><td>2 (0.11%)</td><td>60 (1.88%)</td><td>30</td></tr><tr><td>jpg</td><td>66 (3.57%)</td><td>1577 (49.33%)</td><td>23</td></tr><tr><td>js</td><td>109 (5.90%)</td><td>4121 (128.90%)</td><td>37</td></tr><tr><td>lock</td><td>1 (0.05%)</td><td>157 (4.91%)</td><td>157</td></tr><tr><td>map</td><td>20 (1.08%)</td><td>4996 (156.27%)</td><td>249</td></tr><tr><td>md</td><td>4 (0.22%)</td><td>445 (13.92%)</td><td>111</td></tr><tr><td>me</td><td>1 (0.05%)</td><td>0 (0.00%)</td><td>0</td></tr><tr><td>noencode</td><td>2 (0.11%)</td><td>0 (0.00%)</td><td>0</td></tr><tr><td>otf</td><td>1 (0.05%)</td><td>1271 (39.76%)</td><td>1271</td></tr><tr><td>php</td><td>2 (0.11%)</td><td>723 (22.61%)</td><td>361</td></tr><tr><td>pm</td><td>1 (0.05%)</td><td>544 (17.02%)</td><td>544</td></tr><tr><td>png</td><td>229 (12.39%)</td><td>5379 (168.25%)</td><td>23</td></tr><tr><td>pptx</td><td>1 (0.05%)</td><td>1224 (38.29%)</td><td>1224</td></tr><tr><td>py</td><td>1 (0.05%)</td><td>220 (6.88%)</td><td>220</td></tr><tr><td>rake</td><td>19 (1.03%)</td><td>2212 (69.19%)</td><td>116</td></tr><tr><td>rb</td><td>677 (36.63%)</td><td>66276 (2073.07%)</td><td>97</td></tr><tr><td>rdoc</td><td>4 (0.22%)</td><td>162 (5.07%)</td><td>40</td></tr><tr><td>rfpdf</td><td>1 (0.05%)</td><td>114 (3.57%)</td><td>114</td></tr><tr><td>rsb</td><td>32 (1.73%)</td><td>510 (15.95%)</td><td>15</td></tr><tr><td>rspec</td><td>1 (0.05%)</td><td>2 (0.06%)</td><td>2</td></tr><tr><td>ru</td><td>1 (0.05%)</td><td>4 (0.13%)</td><td>4</td></tr><tr><td>sample</td><td>1 (0.05%)</td><td>19 (0.59%)</td><td>19</td></tr><tr><td>sqlite3</td><td>1 (0.05%)</td><td>0 (0.00%)</td><td>0</td></tr><tr><td>svg</td><td>1 (0.05%)</td><td>338 (10.57%)</td><td>338</td></tr><tr><td>tmpl</td><td>1 (0.05%)</td><td>12 (0.38%)</td><td>12</td></tr><tr><td>ttf</td><td>1 (0.05%)</td><td>708 (22.15%)</td><td>708</td></tr><tr><td>txt</td><td>6 (0.32%)</td><td>5520 (172.66%)</td><td>920</td></tr><tr><td>woff</td><td>1 (0.05%)</td><td>105 (3.28%)</td><td>105</td></tr><tr><td>yml</td><td>77 (4.17%)</td><td>54013 (1689.49%)</td><td>701</td></tr><tr><td>z</td><td>17 (0.92%)</td><td>4940 (154.52%)</td><td>290</td></tr></table></body></html>
--- a/statistics/trustie2/trustie/files_by_date.dat
+++ b/statistics/trustie2/trustie/files_by_date.dat
@ -0,0 +1,34 @@
+2013-08-01 1695
+2013-08-01 1696
+2013-08-01 1697
+2013-08-01 1698
+2013-08-01 1699
+2013-08-01 1704
+2013-08-01 1709
+2013-08-01 1711
+2013-08-01 1712
+2013-08-01 1714
+2013-08-01 1720
+2013-08-02 1712
+2013-08-02 1717
+2013-08-02 1718
+2013-08-03 1718
+2013-08-03 1719
+2013-08-04 1719
+2013-08-04 1721
+2013-08-04 1724
+2013-08-05 1724
+2013-08-05 1725
+2013-08-06 1725
+2013-08-06 1783
+2013-08-06 1784
+2013-08-07 1784
+2013-08-08 1784
+2013-08-08 1785
+2013-08-08 1839
+2013-08-08 1844
+2013-08-08 1845
+2013-08-08 1846
+2013-08-08 1847
+2013-08-09 1847
+2013-08-09 1849
--- a/statistics/trustie2/trustie/files_by_date.plot
+++ b/statistics/trustie2/trustie/files_by_date.plot
@ -0,0 +1,14 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'files_by_date.svg'
+unset key
+set xdata time
+set timefmt "%Y-%m-%d"
+set format x "%Y-%m-%d"
+set grid y
+set ylabel "Files"
+set xtics rotate by 90
+set ytics autofreq
+set bmargin 6
+plot 'files_by_date.dat' using 1:2 w steps
--- a/statistics/trustie2/trustie/files_by_date.svg
+++ b/statistics/trustie2/trustie/files_by_date.svg
@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,372.0 L575.0,372.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,372.0 L89.2,372.0 M575.0,372.0 L566.0,372.0  h0.01'/>	<g transform="translate(71.9,376.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1680</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,337.9 L575.0,337.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,337.9 L89.2,337.9 M575.0,337.9 L566.0,337.9  h0.01'/>	<g transform="translate(71.9,342.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1700</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,303.7 L575.0,303.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,303.7 L89.2,303.7 M575.0,303.7 L566.0,303.7  h0.01'/>	<g transform="translate(71.9,308.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1720</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,269.6 L575.0,269.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,269.6 L89.2,269.6 M575.0,269.6 L566.0,269.6  h0.01'/>	<g transform="translate(71.9,274.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1740</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,235.4 L575.0,235.4  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,235.4 L89.2,235.4 M575.0,235.4 L566.0,235.4  h0.01'/>	<g transform="translate(71.9,239.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1760</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,201.3 L575.0,201.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,201.3 L89.2,201.3 M575.0,201.3 L566.0,201.3  h0.01'/>	<g transform="translate(71.9,205.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1780</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,167.1 L575.0,167.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,167.1 L89.2,167.1 M575.0,167.1 L566.0,167.1  h0.01'/>	<g transform="translate(71.9,171.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1800</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,133.0 L575.0,133.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,133.0 L89.2,133.0 M575.0,133.0 L566.0,133.0  h0.01'/>	<g transform="translate(71.9,137.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1820</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,98.8 L575.0,98.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,98.8 L89.2,98.8 M575.0,98.8 L566.0,98.8  h0.01'/>	<g transform="translate(71.9,103.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1840</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,64.7 L89.2,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(71.9,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1860</text>
+	</g>
+	<path stroke='black'  d='M80.2,372.0 L80.2,363.0 M80.2,64.7 L80.2,73.7  h0.01'/>	<g transform="translate(84.7,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-01</text>
+	</g>
+	<path stroke='black'  d='M95.7,372.0 L95.7,367.5 M95.7,64.7 L95.7,69.2 M111.1,372.0 L111.1,367.5 M111.1,64.7 L111.1,69.2 
+		M126.6,372.0 L126.6,367.5 M126.6,64.7 L126.6,69.2 M142.1,372.0 L142.1,363.0 M142.1,64.7 L142.1,73.7 
+		 h0.01'/>	<g transform="translate(146.6,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-02</text>
+	</g>
+	<path stroke='black'  d='M157.5,372.0 L157.5,367.5 M157.5,64.7 L157.5,69.2 M173.0,372.0 L173.0,367.5 M173.0,64.7 L173.0,69.2 
+		M188.4,372.0 L188.4,367.5 M188.4,64.7 L188.4,69.2 M203.9,372.0 L203.9,363.0 M203.9,64.7 L203.9,73.7 
+		 h0.01'/>	<g transform="translate(208.4,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-03</text>
+	</g>
+	<path stroke='black'  d='M219.4,372.0 L219.4,367.5 M219.4,64.7 L219.4,69.2 M234.8,372.0 L234.8,367.5 M234.8,64.7 L234.8,69.2 
+		M250.3,372.0 L250.3,367.5 M250.3,64.7 L250.3,69.2 M265.8,372.0 L265.8,363.0 M265.8,64.7 L265.8,73.7 
+		 h0.01'/>	<g transform="translate(270.3,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-04</text>
+	</g>
+	<path stroke='black'  d='M281.2,372.0 L281.2,367.5 M281.2,64.7 L281.2,69.2 M296.7,372.0 L296.7,367.5 M296.7,64.7 L296.7,69.2 
+		M312.1,372.0 L312.1,367.5 M312.1,64.7 L312.1,69.2 M327.6,372.0 L327.6,363.0 M327.6,64.7 L327.6,73.7 
+		 h0.01'/>	<g transform="translate(332.1,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-05</text>
+	</g>
+	<path stroke='black'  d='M343.1,372.0 L343.1,367.5 M343.1,64.7 L343.1,69.2 M358.5,372.0 L358.5,367.5 M358.5,64.7 L358.5,69.2 
+		M374.0,372.0 L374.0,367.5 M374.0,64.7 L374.0,69.2 M389.5,372.0 L389.5,363.0 M389.5,64.7 L389.5,73.7 
+		 h0.01'/>	<g transform="translate(394.0,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-06</text>
+	</g>
+	<path stroke='black'  d='M404.9,372.0 L404.9,367.5 M404.9,64.7 L404.9,69.2 M420.4,372.0 L420.4,367.5 M420.4,64.7 L420.4,69.2 
+		M435.8,372.0 L435.8,367.5 M435.8,64.7 L435.8,69.2 M451.3,372.0 L451.3,363.0 M451.3,64.7 L451.3,73.7 
+		 h0.01'/>	<g transform="translate(455.8,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-07</text>
+	</g>
+	<path stroke='black'  d='M466.8,372.0 L466.8,367.5 M466.8,64.7 L466.8,69.2 M482.2,372.0 L482.2,367.5 M482.2,64.7 L482.2,69.2 
+		M497.7,372.0 L497.7,367.5 M497.7,64.7 L497.7,69.2 M513.2,372.0 L513.2,363.0 M513.2,64.7 L513.2,73.7 
+		 h0.01'/>	<g transform="translate(517.7,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-08</text>
+	</g>
+	<path stroke='black'  d='M528.6,372.0 L528.6,367.5 M528.6,64.7 L528.6,69.2 M544.1,372.0 L544.1,367.5 M544.1,64.7 L544.1,69.2 
+		M559.5,372.0 L559.5,367.5 M559.5,64.7 L559.5,69.2 M575.0,372.0 L575.0,363.0 M575.0,64.7 L575.0,73.7 
+		 h0.01'/>	<g transform="translate(579.5,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-09</text>
+	</g>
+	<path stroke='black'  d='M80.2,64.7 L80.2,372.0 L575.0,372.0 L575.0,64.7 L80.2,64.7 Z  h0.01'/>	<g transform="translate(17.6,218.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Files</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='red'  d='M80.2,346.4 L80.2,344.7 L80.2,343.0 L80.2,341.3 L80.2,339.6 L80.2,331.0 L80.2,322.5 L80.2,319.1 
+		L80.2,317.4 L80.2,314.0 L80.2,303.7 L142.1,303.7 L142.1,317.4 L142.1,308.8 L142.1,307.1 L203.9,307.1 
+		L203.9,305.4 L265.8,305.4 L265.8,302.0 L265.8,296.9 L327.6,296.9 L327.6,295.2 L389.5,295.2 L389.5,196.2 
+		L389.5,194.4 L451.3,194.4 L513.2,194.4 L513.2,192.7 L513.2,100.6 L513.2,92.0 L513.2,90.3 L513.2,88.6 
+		L513.2,86.9 L575.0,86.9 L575.0,83.5  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,64.7 L80.2,372.0 L575.0,372.0 L575.0,64.7 L80.2,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
--- a/statistics/trustie2/trustie/gitstats.cache
+++ b/statistics/trustie2/trustie/gitstats.cache
--- a/Show More
+++ b/Show More