Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/student_work_controller.rb

@@ -193,11 +193,15 @@ class StudentWorkController < ApplicationController
           user_activity.updated_at = Time.now
           user_activity.save
         end
+        @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
         respond_to do |format|
+          format.js
+=begin
           format.html {
             flash[:notice] = l(:notice_successful_create)
             redirect_to student_work_index_url(:homework => @homework.id)
           }
+=end
         end
         return
       end

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>

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">

app/views/student_work/_work_information.html.erb

@@ -0,0 +1,29 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <span class="f16 fontBlue fb">您上传的作品信息</span>
+    <p class="f14 mt5">
+      <span class="fb">作品名称：</span><%=@student_work.name%>
+    </p>
+    <p class="f14 mt5">
+      <span class="fb">作品描述：</span><%=@student_work.description%>
+    </p>
+    <p class="mt5">
+      <span class="fl fb mr30">附</span><span class="fb fl">件：</span>
+      <% if @student_work.attachments.count == 0%>
+        <%= "无附件"%>
+      <% else %>
+        <div class="fl">
+            <% @student_work.attachments.each do |attachment| %>
+              <span style="display: block; color: #808181;"><%=attachment.filename %></span>
+            <% end %>
+        </div>
+      <% end %>
+    </p>
+    <div class="cl"></div>
+    <div class="ni_btn mt10">
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= student_work_index_url(:homework => @homework.id)%>');" style="margin-bottom: 15px; margin-left: 55px;" >
+        确&nbsp;&nbsp;定
+      </a>
+    </div>
+  </div>
+</div>

app/views/student_work/create.js.erb

@@ -0,0 +1,7 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("anonymos");

app/views/student_work/new.html.erb

@@ -73,7 +73,7 @@
                  :url => {:controller => 'student_work',
                           :action => 'create',
                           :homework => @homework.id
-                 }) do |f|%>
+                 },:remote=>true ) do |f| %>
         <div class=" c_red mb10">
           提示：作品名称和描述中不要出现真实的姓名信息
         </div>

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|

public/stylesheets/courses.css

@@ -33,7 +33,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .ctt2{clear:both; }
 .hworkListBanner {width:720px; height:40px; background:#eaeaea; margin-bottom:10px;}
 .hworkListContainer {float:left; clear:both; width:720px;}
-.showHwork{ border:2px solid #269ac9; width:696px; padding:10px; color:#666666; padding-bottom:0px; }
+.showHwork{ border:1px solid #eaeaea; width:696px; padding:10px; color:#666666; padding-bottom:0px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); }
 .showHworkP{ width:630px; float:left;}
 .showHwork ul li {margin-bottom: 5px;}
 .hworkPingText{ float:left; border:1px solid #e4e4e4; padding:5px; width:618px; height:35px;}
@@ -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;}
@@ -837,7 +838,7 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
 a.hwork_center{ display:block; width:60px; text-align:center; margin-right:5px;}
 .show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; }
 .show_hwork ul li{ margin-bottom:5px;}
-.show_hwork_arrow{ position:relative; top:2px; left:165px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;}
+.show_hwork_arrow{ position:relative; top:1px; left:165px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;}
 .tit_fb{ font-weight:bold; width:66px; text-align:right; display:block; float:left;}
 .ml160{ margin-left:160px;}
 .show_hwork_p{ width:630px; float:left;}

public/stylesheets/new_user.css

@@ -213,6 +213,8 @@ a.bBlue {background-color:#3498db;}
 a.bBlue:hover {background-color:#297fb8;}
 a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
 a.submit_btn:hover {background-color:#3498db; color:#ffffff;}
+a.submit_btn2 {background-color: #269ac9; padding: 3px 5px; color: #ffffff;}
+a.submit_btn2:hover {background-color:  #297fb8;}
 
 /****翻页***/
 .wlist{float:right;}
@@ -1295,13 +1297,13 @@ a:hover.SetUpIcon{background: url(../images/homepage_icon.png) 0px -486px no-rep
 /* 开启匿评弹框 */
 .anonymos{width:480px;height:180px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .anonymos_work {position:fixed !important;left:60%;top:60%;margin:-215px 0 0 -300px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
-.ni_con { width:425px; margin:25px 30px;}
+.ni_con { width:425px; margin:15px;}
 .ni_con h2{ display:block; height:40px; width:425px;   text-align:center; color:#3a3a3a;}
 .ni_con p{ color:#808181; }
 .ni_con a:hover{ text-decoration:none;}
 .ni_btn{ width:190px; margin:15px auto;  line-height:1.9;}
-a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
-a:hover.tijiao{ background:#0f99a9;}
+a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#269ac9; text-align:center; padding-top:4px; float:left; margin-right:15px;}
+a:hover.tijiao{ background:#297fb8;}
 .c_pink{ color:#e65d5e;}
 .ni_con_work { width:300px; margin:25px 20px;}
 .ni_con_work p{ color:#808181; }