新建作品、编辑作品界面修改

app/controllers/student_work_controller.rb

@@ -182,11 +182,12 @@ class StudentWorkController < ApplicationController
   end
 
   def edit
+    @user = User.current
     if !User.current.admin? && @homework.homework_type == 2   #编程作业不能修改作业
       render_403
     else
       respond_to do |format|
-        format.html
+        format.html{ render :layout => "new_base_user"}
       end
     end
   end

app/views/attachments/_new_form.html.erb

@@ -23,6 +23,7 @@
   <% end %>
 <% end %>
 </span>
+  <div class="cl"></div>
   <% project = project %>
   <span class="add_attachment" style="font-weight:normal;">
   <%= button_tag l(:button_browse), :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()',:class => 'sub_btn', :style => ie8? ? 'display:none' : '' %>

app/views/student_work/edit.html.erb

@@ -1,5 +1,6 @@
-<div class="project_r_h">
-  <h2 class="project_h2">编辑作品</h2>
+<div class="HomeWork" id="RSide">
+  <div class="RightBanner">
+    <div class="NewsBannerName">编辑作品</div>
   </div>
   <div class="Newwork">
     <div class="hwork_ctt">
@@ -38,8 +39,8 @@
               </p>
               <div class="cl"></div>
               <p class="ml80 ">
-          <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="edit_student_work(<%= @work.id%>);">提交作品</a>
-          <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white"%>
+                <a href="javascript:void(0)" class="blue_btn fl c_white mt10" onclick="edit_student_work(<%= @work.id%>);">提交作品</a>
+                <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white mt10 ml10"%>
               <div class="cl"></div>
               </p>
             </div><!---创建作业内容结束-->
@@ -50,3 +51,4 @@
   </div>
 </div><!--新建作业结束-->
 <div class="cl"></div>
+</div>

app/views/student_work/new.html.erb

@@ -77,8 +77,8 @@
                         <div class="cl"></div>
                     <% end%>
                     <p class="ml80 ">
-                      <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="new_student_work();">提交作品</a>
-                      <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white"%>
+                      <a href="javascript:void(0)" class="blue_btn fl c_white mt10" onclick="new_student_work();">提交作品</a>
+                      <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white mt10 ml10"%>
                     <div class="cl"></div>
                     </p>
                     </div><!---创建作业内容结束-->

public/javascripts/new_user.js

@@ -132,3 +132,49 @@ function search_homework_by_name(url){
         }
     );
 }
+
+//提交新建作品
+function new_student_work()
+{
+    if(regexStudentWorkName()&&regexStudentWorkDescription())
+    {$("#new_student_work").submit();}
+}
+
+function edit_student_work(id)
+{
+    if(regexStudentWorkName()&&regexStudentWorkDescription())
+    {$("#edit_student_work_" + id).submit();}
+}
+
+//验证作品名称
+function regexStudentWorkName()
+{
+    var name = $.trim($("#student_work_name").val());
+
+    if(name=="")
+    {
+        $("#student_work_name_span").text("作品名称不能为空");
+        return false;
+    }
+    else
+    {
+        $("#student_work_name_span").text("");
+        return true;
+    }
+}
+
+function regexStudentWorkDescription()
+{
+    var name = $.trim($("#student_work_description").val());
+
+    if(name=="")
+    {
+        $("#student_work_description_textarea").text("作品描述不能为空");
+        return false;
+    }
+    else
+    {
+        $("#student_work_description_textarea").text("");
+        return true;
+    }
+}

public/stylesheets/new_user.css

@@ -187,7 +187,7 @@ a:hover.grey_n_btn{ background:#717171; color:#fff;}
 .green_btn{ background:#28be6c; color:#fff;  font-weight:normal;padding:2px 10px; text-align:center;}
 a.green_btn{background:#28be6c;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;}
 a:hover.green_btn{ background:#14ad5a;}
-.blue_btn{ background:#64bdd9; color:#fff;  font-weight:normal;padding:2px 10px; text-align:center;}
+.blue_btn{ background:#64bdd9; color:#fff; font-size:14px; font-weight:normal;padding:2px 8px; text-align:center;}
 a.blue_btn{background:#64bdd9;color:#fff; font-weight:normal; padding:2px 10px; text-align:center;}
 a:hover.blue_btn{ background:#329cbd;}
 a.orange_btn{  background:#ff5722;color:#fff; font-weight:normal; padding:2px 10px; text-align:center; }