From f2f06a9d282eeac8f080c7cc79971a123e73349c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 13 Aug 2014 16:06:40 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E7=94=A8=E6=88=B7=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/users.html.erb | 13 ++-----------
 db/schema.rb                   | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
index 8bd1ef446..47d588ec2 100644
--- a/app/views/admin/users.html.erb
+++ b/app/views/admin/users.html.erb
@@ -37,18 +37,9 @@
           <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
           <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
           <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
-          <th></th>
+          <th style="width: 100px;"></th>
         </tr>
         </thead>
-        <col style="width: 10%" />
-        <col style="width: 5%" />
-        <col style="width: 5%" />
-        <col style="width: 10%" />
-        <col style="width: 5%" />
-        <col style="width: 10%" />
-        <col style="width: 10%" />
-        <col style="width: 5%" />
-        <col style="width: 5%" />
         <tbody>
         <% for user in @users -%>
             <tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
@@ -59,7 +50,7 @@
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center"><%= checked_image user.admin? %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-              <td class="buttons"> <%= change_status_link(user) %>
+              <td> <%= change_status_link(user) %>
                 <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>
diff --git a/db/schema.rb b/db/schema.rb
index 7a921754a..cdedc6a2c 100644
--- 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 => 20140811022947) do
+ActiveRecord::Schema.define(:version => 20140812065417) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -291,6 +291,24 @@ ActiveRecord::Schema.define(:version => 20140811022947) do
     t.datetime "updated_on",                  :null => false
   end
 
+  create_table "course_attachments", :force => true do |t|
+    t.string   "filename"
+    t.string   "disk_filename"
+    t.integer  "filesize"
+    t.string   "content_type"
+    t.string   "digest"
+    t.integer  "downloads"
+    t.string   "author_id"
+    t.string   "integer"
+    t.string   "description"
+    t.string   "disk_directory"
+    t.integer  "attachtype"
+    t.integer  "is_public"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+    t.integer  "container_id",   :default => 0
+  end
+
   create_table "course_infos", :force => true do |t|
     t.integer  "course_id"
     t.integer  "user_id"
@@ -889,6 +907,19 @@ ActiveRecord::Schema.define(:version => 20140811022947) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1

From a7e22a737979071f1af778383dd2ccdbd96ffc88 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 13 Aug 2014 16:10:47 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dadmin=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/search.html.erb | 20 ++++++++++----------
 app/views/admin/users.html.erb  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/admin/search.html.erb b/app/views/admin/search.html.erb
index 67c97366e..5d49d84fa 100644
--- a/app/views/admin/search.html.erb
+++ b/app/views/admin/search.html.erb
@@ -26,7 +26,7 @@
     &nbsp;
 
     <div class="autoscroll">
-      <table class="list">
+      <table class="list" style="width: 100%;table-layout: fixed">
         <thead>
         <tr>
           <%= sort_header_tag('login', :caption => l(:field_login)) %>
@@ -37,20 +37,20 @@
           <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
           <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
           <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
-          <th></th>
+          <th style="width: 100px;"></th>
         </tr>
         </thead>
         <tbody>
         <% for user in @users -%>
             <tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
-              <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
-              <td class="firstname"><%= h(user.firstname) %></td>
-              <td class="lastname"><%= h(user.lastname) %></td>
-              <td class="email"><%= mail_to(h(user.mail)) %></td>
-              <td align="center"><%= checked_image user.admin? %></td>
-              <td class="created_on" align="center"><%= format_time(user.created_on) %></td>
-              <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-              <td class="buttons"> <%= change_status_link(user) %>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="username" title='<%=user.login%>'> <%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="firstname" align="center" title='<%=user.firstname%>'><%= h(user.firstname) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="lastname" align="center" title='<%=user.lastname%>'><%= h(user.lastname) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="email" align="center" title='<%=user.mail%>'><%= mail_to(h(user.mail)) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center"><%= checked_image user.admin? %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
+              <td  class="buttons"> <%= change_status_link(user) %>
                 <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>
diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
index 47d588ec2..4a76a42ef 100644
--- a/app/views/admin/users.html.erb
+++ b/app/views/admin/users.html.erb
@@ -50,7 +50,7 @@
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center"><%= checked_image user.admin? %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-              <td> <%= change_status_link(user) %>
+              <td  class="buttons"> <%= change_status_link(user) %>
                 <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>

From 440395f26f40fc0b1f9b55e3dfd621682d56e7eb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 13 Aug 2014 16:52:07 +0800
Subject: [PATCH 3/6] =?UTF-8?q?#1290=20=E4=BF=AE=E6=94=B9admin=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86--=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8--=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_memberships.html.erb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_memberships.html.erb b/app/views/users/_memberships.html.erb
index 5f61d2ce2..2c18ed416 100644
--- a/app/views/users/_memberships.html.erb
+++ b/app/views/users/_memberships.html.erb
@@ -1,4 +1,4 @@
-<% roles = Role.find_all_givable %>
+<% roles = Role.find_all_givable[0..2] %>
 <% projects = Project.active.all %>
 
 <div class="splitcontentleft">
@@ -50,12 +50,19 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 </div>
+<script type="text/javascript">
+  window.onready = function()
+  {
+      $("#membership_project_id").css("width","150px");
+      $("#membership_project_id").css("overflow ","hidden");
 
+  }
+</script>
 <div class="splitcontentright">
 <% if projects.any? %>
-<fieldset><legend><%=l(:label_project_new)%></legend>
+<fieldset style="width: 170px;"><legend><%=l(:label_project_new)%></legend>
 <%= form_for(:membership, :remote => true, :url => user_memberships_path(@user)) do %>
-<%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
+<div style="width:100px;"><%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects)%></div>
 <p><%= l(:label_role_plural) %>:
 <% roles.each do |role| %>
   <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>

From 8c59abc070a4fa4b764c70eed62762924c7bf819 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 13 Aug 2014 16:55:42 +0800
Subject: [PATCH 4/6] =?UTF-8?q?#1279=20=E4=BF=AE=E6=94=B9=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/stores/_search_bar.html.erb  | 2 +-
 app/views/welcome/_search_bar.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/stores/_search_bar.html.erb b/app/views/stores/_search_bar.html.erb
index c91f90e96..884f8b263 100644
--- a/app/views/stores/_search_bar.html.erb
+++ b/app/views/stores/_search_bar.html.erb
@@ -4,5 +4,5 @@
 	&nbsp;&nbsp;
 	<%= submit_tag l(:label_search), :class => "enterprise"%>
 	<% end %>
-	<div class='font_lighter' style="display: inline-block; margin-top:3px;">全站文件搜索。不会搜索私有项目中的内容、学生已经提交的作业。</div>
+	<div class='font_lighter' style="display: inline-block; margin-top:3px;">全站文件搜索。不会搜索私有项目中的内容。</div>
 </div>
\ No newline at end of file
diff --git a/app/views/welcome/_search_bar.html.erb b/app/views/welcome/_search_bar.html.erb
index 73a497835..302aa3c26 100644
--- a/app/views/welcome/_search_bar.html.erb
+++ b/app/views/welcome/_search_bar.html.erb
@@ -4,5 +4,5 @@
 	&nbsp;&nbsp;
 	<%= submit_tag l(:label_search), :class => "enterprise"%>
 	<% end %>
-	<div class='font_lighter' style="margin: 0; padding: 0; margin-top: 4px;">全站文件搜索。不会搜索私有项目中的内容和学生已经提交的作业。</div>
+	<div class='font_lighter' style="margin: 0; padding: 0; margin-top: 4px;">全站文件搜索。不会搜索私有项目中的内容。</div>
 </div>
\ No newline at end of file

From df0c1e5917893d447e89a1f246e983538ae6646b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 13 Aug 2014 17:37:00 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=B6=85=E5=87=BA=E7=95=8C=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/show.html.erb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 89fc862d0..204dd519a 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -4,7 +4,9 @@
 
 <%= render :partial => 'action_menu' %>
 
-<h3><%= issue_heading(@issue) %></h3>
+<h3>
+  <%= issue_heading(@issue) %>
+</h3>
 
 <style type="text/css"></style>
 
@@ -25,9 +27,9 @@
     </div>
   <% end %>
 
-  <!-- <%= avatar(@issue.author, :size => "50") %> -->
+  <!-- <%#= avatar(@issue.author, :size => "50") %> -->
 
-<div class="subject">
+<div class="subject"  style="word-wrap: break-word;">
 <%= render_issue_subject_with_tree(@issue) %>
 </div> 
 

From 9d0f759a7140d1a0bc8c8703d33a04687a88998d Mon Sep 17 00:00:00 2001
From: zhanghaitao <562681745@qq.com>
Date: Thu, 14 Aug 2014 09:42:58 +0800
Subject: [PATCH 6/6] =?UTF-8?q?#939=20=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=97=97=E5=B8=9C=E6=97=B6=E9=97=B4=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index e299be182..71bea9cfa 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,7 +1,8 @@
 <% if @events_by_day.size >0 %>
     <div class="content-title-top-avtive">
       <p class="subtitle">
-        <%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
+        <% # 暂时隐藏时间的显示%>
+        <%#= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
       </p>
 
       <% @events_by_day.keys.sort.reverse.each do |day| %>