From 223b17d8fe7ae109e54484ab6498210bd090451c Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 5 Nov 2015 14:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E4=BD=9C=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81=E7=B3=BB=E7=BB=9F=E8=AF=84=E5=88=86=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E3=80=81=E5=8C=BF=E8=AF=84=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_un_title.html.erb |  2 +-
 .../student_work/_student_work_list.html.erb   |  2 +-
 db/schema.rb                                   | 18 ++++++++++++++----
 public/stylesheets/courses.css                 |  9 +++++----
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index 26c69d225..4ed0a538a 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -1,6 +1,6 @@
 <ul class="hworkUl">
   <li class="hworkList340 hworkH30 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
-    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr60 ml80' : 'mr95 ml100'%>">作品名称</span>
+    <span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr90 ml50' : 'mr140 ml50'%>">作品名称</span>
     <span class="c_dark f14 fb fl mr50">姓名</span>
     <span class="c_dark f14 fb fl">学号</span>
   </li>
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index e23fcceda..e8468bda2 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -1,4 +1,4 @@
-<div class="fl" style="border-bottom:1px solid #eaeaea; padding-bottom:10px; width:720px;">
+<div class="fl" style="padding-bottom:10px; width:720px;">
   <span class="c_dark f14 fb fl mr30">
       作品
       <font class="f12 c_red">
diff --git a/db/schema.rb b/db/schema.rb
index 63b09498e..b7e1bfa1c 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 => 20151102085318) do
+ActiveRecord::Schema.define(:version => 20151102090519) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1038,11 +1038,21 @@ ActiveRecord::Schema.define(:version => 20151102085318) do
     t.integer  "project_id"
   end
 
+  create_table "org_members", :force => true do |t|
+    t.integer "user_id"
+    t.integer "organization_id"
+    t.string  "role"
+  end
+
   create_table "organizations", :force => true do |t|
     t.string   "name"
-    t.string   "logo_link"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.text     "description"
+    t.integer  "creator_id"
+    t.integer  "home_id"
+    t.string   "domain"
+    t.boolean  "is_public"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   end
 
   create_table "phone_app_versions", :force => true do |t|
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 317a21d02..a3f8818f0 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -41,9 +41,9 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .pingBoxTit{ float:left; width:625px; margin-left:10px;}
 .pingText{border:1px solid #CCCCCC; margin:5px; padding:5px; width:610px; height:20px; }
 .pingBackTit{ float:left; width:573px; margin-left:10px; }
-.hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle;}
+.hworkUl{ height:30px; border-bottom:1px solid #eaeaea; line-height:30px; vertical-align:middle; background-color: #f6f6f6;}
 .hworkH30 {height:30px !important; line-height:30px !important;}
-.hworkListRow {height:65px; border-bottom:1px solid #eaeaea; line-height:65px; vertical-align:middle;}
+.hworkListRow {height:65px; border-bottom:1px dashed #eaeaea; line-height:65px; vertical-align:middle;}
 .hworkListRow:hover {background-color:#f6f6f7;}
 .hworkUl li{ float:left;}
 .hworkListRow li{ float:left;}
@@ -71,9 +71,9 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .classSplit {border:1px solid #e7e7e7; height:27px; line-height:27px; display:inline-block; margin-left:10px; padding-left:5px; cursor:pointer; outline:none; width:95px; max-width:95px;}
 .classList {width:45px; border:1px solid #e7e7e7; float:left; position:absolute; background-color:#ffffff; left:-1px;}
 .hworkPortrait {float:left; width:40px;}
-.HomeworkNameTitle{width: 285px;text-align: center;margin-left: 50px;}
+.HomeworkNameTitle{width: 285px;text-align: left;margin-left: 50px;}
 .HomeworkStuTitle{width: 80px;text-align: center;}
-.StudentName{display: table-cell;width: 115px;vertical-align: middle;text-align: center;height: 40px;}
+.StudentName{display: table-cell;width: 115px;vertical-align: middle;text-align: left;height: 40px;}
 .width385{width: 385px;}
 .width505{width: 505px;}
 .width165{width: 165px;}
@@ -81,6 +81,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .width525{width: 525px;}
 .width285{width: 285px;}
 .mr95{margin-right: 95px;}
+.mr140 {margin-right: 140px;}
 .ml100{margin-left: 100px;}
 .mt16{margin-top: 16px;}
 .pr10{padding-right: 10px;}