1.修改作业界面修改

2.作业附件取消加粗显示
3.作业创建、修改建业页面高度为自动
4.删除作业成员增加相关提示

app/views/attachments/_form.html.erb

@@ -27,25 +27,28 @@
 //        file.click();
 //    }
 </script>
-<span class="add_attachment">
+<span class="add_attachment" style="font-weight:normal;">
-<%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
+    <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
-<!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
+    <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()' %>
+    <%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()' %>
-<%= file_field_tag 'attachments[dummy][file]',
+    <%= file_field_tag 'attachments[dummy][file]',
-      :id => '_file',
+          :id => '_file',
-      :class => 'file_selector',
+          :class => 'file_selector',
-      :multiple => true,
+          :multiple => true,
-      :onchange => 'addInputFiles(this);',
+          :onchange => 'addInputFiles(this);',
-      :style => 'display:none',
+          :style => 'display:none',
-      :data => {
+          :data => {
-        :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+            :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-        :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+            :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-        :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+            :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-        :upload_path => uploads_path(:format => 'js'),
+            :upload_path => uploads_path(:format => 'js'),
-        :description_placeholder => l(:label_optional_description)
+            :description_placeholder => l(:label_optional_description)
-      } %>
+          } %>
-<span id="upload_file_count"><%= l(:label_no_file_uploaded)%></span>
+    <span id="upload_file_count">
-(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+      <%= l(:label_no_file_uploaded)%>
+    </span>
+    (<%= l(:label_max_size) %>:
+    <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 
 <% content_for :header_tags do %>

app/views/attachments/_links.html.erb

@@ -1,7 +1,7 @@
-<div class="attachments">
+<div class="attachments" style="font-weight:normal;">
 <% for attachment in attachments %>
 <p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-  <span title="<%= attachment.filename%>" id = "attachment_">
+  <span title="<%= attachment.filename%>" id = "attachment_"">
     <% if options[:length] %>
       <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
     <% else %>

app/views/homework_attach/_homework_member.html.erb

@@ -4,8 +4,12 @@
   <table class="list members" style="width: 100%">
     <thead>
     <tr>
-      <th><%= l(:label_user) %></th>
+      <th>
-      <th><%= l(:label_role_plural) %></th>
+        <%= l(:label_user) %>
+      </th>
+      <th>
+        <%= l(:label_role_plural) %>
+      </th>
       <th style="width:10%"></th>
     </tr>
     </thead>
@@ -19,9 +23,15 @@
         <% hoemwork_users.each do |user| %>
             <tr id="member-<%= user.id %>" class="<%= cycle 'odd', 'even' %> member" style="text-align: center">
               <% if homework.user != user %>
-                  <td style="width: 40%"><%= link_to_user user %></td>
+                  <td style="width: 40%">
-                  <td style="text-align: center;width: 50%"> 参与人员 </td>
+                    <%= link_to_user user %>
-                  <td><%= link_to l(:button_delete),destory_homework_users_homework_attach_path(:user_id=>user),:remote => true, :method => :post  %></td>
+                  </td>
+                  <td style="text-align: center;width: 50%">
+                    参与人员
+                  </td>
+                  <td>
+                    <%= link_to l(:button_delete),destory_homework_users_homework_attach_path(:user_id=>user),:remote => true, :method => :post, :confirm => l(:label_delete_confirm)  %>
+                  </td>
               <% end %>
             </tr>
         <% end %>
@@ -31,14 +41,18 @@
 
 <div class="splitcontentright" style="width: 37%">
   <%= form_for(hoemwork_users, {:url => add_homework_users_homework_attach_path(homework), :remote => true, :method => :post}) do |f| %>
-      <fieldset>
+    <span>
-        <legend><%= l(:label_member_new) %></legend>
+      <%= l(:label_member_new) %>
-        <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
+    </span>
-        <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript get_homework_member_list_homework_attach_index_path(:q => params[:q], :bid_id => params[:id]||homework, :format => 'js') }')" %>
+    <p>
-        <div id="principals_for_new_member">
+      <%= label_tag "principal_search", l(:label_principal_search) %>
-          <%= render_new_members_for_homework(members) %>
+      <%= text_field_tag 'principal_search', nil %></p>
-        </div>
+      <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript get_homework_member_list_homework_attach_index_path(:q => params[:q], :bid_id => params[:id]||homework, :format => 'js') }')" %>
-        <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
+    <div id="principals_for_new_member">
-      </fieldset>
+      <%= render_new_members_for_homework(members) %>
+    </div>
+    <p>
+      <%= submit_tag l(:button_add), :id => 'member-add-submit' %>
+    </p>
   <% end %>
 </div>

app/views/homework_attach/edit.html.erb

@@ -1,75 +1,103 @@
+<!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>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>新建作业</title>
+  <%= stylesheet_link_tag  'css'%>
+  <script type="text/javascript" language="javascript">
+      function switchTab(ProTag){
+          var display_index = 3 - ProTag;
+          $("#tb_" + ProTag).attr("class","hovertab");
+          $("#tb_" + display_index).attr("class","normaltab");
+          $("#content" + ProTag).show();
+          $("#content" + display_index).hide();
+      }
+      function submit_homework_form()
+      {
+          $('#edit_homework_attach_<%= @homework.id%>').submit();
+      }
+  </script>
+</head>
 
-<script type="text/javascript">
+<body>
-    function switchTab(ProTag) {
+<div class="container">
-        var display_index = 3 - ProTag;
+  <div class="Newwork">
-        $("#tab" + ProTag).attr("class","selected");
+    <div id="tb_" class="tb_">
-        $("#tab" + display_index).attr("class","");
+      <ul>
-        $("#content" + ProTag).show();
+        <li id="tb_1" class="hovertab" onclick="switchTab(1);this.blur();return false;" style="width: auto; padding:5px 10px 0;">
-        $("#content" + display_index).hide();
+          修改作业
-    }
+        </li>
-</script>
+        <li id="tb_2" class="normaltab" onclick="switchTab(2);this.blur();return false;">
+          成员
+        </li>
+        <li class="N_top" style="width: 747px;">
+          <%= link_to(l(:label_project_new), {:controller => 'projects',
+                                              :action => 'new',
+                                              :course => 0,
+                                              :project_type => 0}) if User.current.allowed_to?(:add_project, nil, :global => true) %>
+        </li>
+      </ul>
 
-<p style="font-weight: bold; color: rgb(237,137,36)" xmlns="http://www.w3.org/1999/html"> <%=raw l(:label_edit_homework)%> </p>
+    </div>
-<div class="tabs">
+    <div id="content1">
-  <ul>
+      <div class="N_con">
-    <li>
+        <%= form_for(@homework) do |f|%>
-      <a id = "tab1" href="#" class = "selected" onclick="switchTab(1);this.blur();return false;">
+          <p>
-        <%= l(:label_information_plural)  %>
+            <label><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-      </a>
+            <%= f.text_field :name, :required => true, :name => "homework_name", :class => "w430 bo", :maxlength => 254, :placeholder => "作品名称"%>
-    </li>
+          </p>
-    <li>
+          <p>
-      <a id="tab2" href="#" onclick="switchTab(2); this.blur(); return false;">
+            <label>&nbsp;&nbsp;&nbsp;提交项目
-        <%= l(:label_member_plural)  %>
+              <img src="/images/bid/pic_question.png" width="16" height="16"
-      </a>
+                   title="项目是一种由用户创建的基于网络的协作空间，能够为个人或小组提供分布式的协同交流和资料管理等方面的支持。
-    </li>
+                            项目托管平台：http://forge.trustie.ne">：
-  </ul>
+            </label>
-</div>
+            <% if @homework.project.nil? %>
-<div class="box" id="content1">
+                <%= f.select :project_id, options_for_select(user_projects_option),{}, {:name => "project_id", :required => true,:class => "w350 bo"}%>
-  <%= form_for(@homework) do |f|%>
+            <% else %>
-    <p style=" padding: 3px 0 3px 0;padding-left: 50px;  clear:left;">
+                <%= f.select :project_id, options_for_select(user_projects_option,@homework.project.id),{},{:name => "project_id", :required => true, :class => "w350 bo"}%>
-      <strong>标&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题&nbsp;<span style="color: red">*</span>：</strong>&nbsp;
+            <% end %>
-      <%= f.text_field :name, :required => true, :name => "homework_name", :size => 60, :style => "width:490px;", :maxlength => 254%>
+          </p>
-    </p>
+          <p>
-    <p style=" padding: 3px 0 3px 0;padding-left: 50px;  clear:left;">
+            <label style="float:left;">
-        <strong>提交项目&nbsp;&nbsp;：</strong>
+              <span class="c_red">*</span>
-        <% if @homework.project.nil? %>
+              &nbsp;&nbsp;作业描述&nbsp;&nbsp;&nbsp;&nbsp;：
-          <%= f.select :project_id, options_for_select(user_projects_option),:name => "project_id", :required => true%>
+            </label>
-        <% else %>
+            <%= f.text_area :description, :rows => 8, :name => "homework_description", :class => "w620",
-          <%= f.select :project_id, options_for_select(user_projects_option,@homework.project.id),:name => "project_id", :required => true%>
+                            :maxlength => 3000, :placeholder => "最多3000个汉字"  %>
-        <% end %>
-
-        <%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target => '_blank' %>
-      <p class="font_lighter" style="padding-left:120px;clear:left;">提交项目可以为空</p>
-    </p>
-    <p style=" padding: 3px 0 3px 0;padding-left: 50px;  clear:left;">
-      <strong  style="vertical-align: top">描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述&nbsp;&nbsp;：</strong>&nbsp;
-      <span style="margin-left:-10px;padding-right: 20px;">
-        <%= f.text_area :description, :rows => 8, :name => "homework_description", :class => 'wiki-edit', :maxlength => 3000, :style => "font-size:small;width:490px;margin-left:10px;" %>
-      </span>
-    </p>
-    <p style="padding-left: 60px">
-        <fieldset style="text-align: left;">
-          <p style="padding-left: 60px">
-            <% options = {:author => true, :deletable => attach_delete(@homework)} %>
-            <%= render :partial => 'attachments/links',
-                       :locals => {:attachments => @homework.attachments, :options => options} %>
           </p>
-          <legend>
+          <div class="cl"></div>
-            <%= l(:label_attachment_plural) %>
+          <p>
-          </legend>
+            <label style="float: left;">&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-          <p style=" padding: 3px 0 3px 0;padding-left: 50px;  clear:left;">
+            <%#= render :partial => 'attachments/form' %>
-            <%= render :partial => 'attachments/form' %>
+            <p style=" padding: 3px 0 3px 0;padding-left: 90px;">
+              <% options = {:author => true, :deletable => attach_delete(@homework)} %>
+              <%= render :partial => 'attachments/links',
+                         :locals => {:attachments => @homework.attachments, :options => options} %>
+            </p>
+            <p style=" padding: 3px 0 3px 0;padding-left: 90px;">
+              <%= render :partial => 'attachments/form' %>
+            </p>
           </p>
-        </fieldset>
-    </p>
-    <p style="padding-left: 60px;padding-top: 10px;">
-    <span >
-      <%= submit_tag t(:label_button_ok), :sta => 0, :class => "enterprise"%>
-    </span>
-    </p>
-  <% end %>
-</div>
 
-<div id="content2" style="display: none" >
+          <p>
-<%= render :partial => "homework_member",:locals => {:members => @members,:hoemwork_users =>@hoemwork_users,:homework => @homework} %>
+            <span style="float: left;">
-</div>
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            </span>
+            <a href="#" class="tijiao" onclick="submit_homework_form();">
+              <%= l(:label_button_ok)  %>
+            </a>
+            <a href="javascript:history.back()" class="tijiao">取&nbsp;&nbsp;消</a>
+          <div class="cl"></div>
+          </p>
+        <% end %>
+      </div><!---创建作业内容结束-->
+    </div>
+
+    <div id="content2" class="undis">
+      <%= render :partial => "homework_member",:locals => {:members => @members,:hoemwork_users =>@hoemwork_users,:homework => @homework} %>
+    </div><!---成员结束-->
+  </div>
+</div><!--新建作业结束-->
+</body>
+</html>

app/views/homework_attach/new.html.erb

@@ -1,19 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%= stylesheet_link_tag  'css', :media => 'all' %>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<script type="text/javascript" language="javascript">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>新建作业</title>
-  <%= stylesheet_link_tag  'css', :media => 'all' %>
-  <script type="text/javascript" language="javascript">
     function submit_homework_form()
     {
         $('#new_homework_attach').submit();
     }
-  </script>
+</script>
-
-</head>
-
-<body>
 <div class="container">
   <div class="Newwork">
     <div id="tb_" class="tb_">
@@ -28,18 +19,16 @@
                                               :project_type => 0}) if User.current.allowed_to?(:add_project, nil, :global => true) %>
         </li>
       </ul>
-
     </div>
-    <div class="ctt">
+    <div class="dis" id="tbc_01">
-      <div class="dis" id="tbc_01">
+      <div class="N_con">
-        <div class="N_con">
+        <%= form_for(HomeworkAttach.new, :method => :post,
-          <%= form_for(HomeworkAttach.new, :method => :post,
+                     :name => 'new_form',
-                       :name => 'new_form',
+                     :url => {:controller => 'homework_attach',
-                       :url => {:controller => 'homework_attach',
+                              :action => 'create',
-                                :action => 'create',
+                              :user_id => User.current.id,
-                                :user_id => User.current.id,
+                              :bid_id => @bid
-                                :bid_id => @bid
+                     }) do |f|%>
-                       }) do |f|%>
             <p>
               <label>
                 <span class="c_red">
@@ -52,7 +41,7 @@
             <p>
               <label>&nbsp;&nbsp;&nbsp;提交项目
                 <img src="/images/bid/pic_question.png" width="16" height="16"
-                            title="项目是一种由用户创建的基于网络的协作空间，能够为个人或小组提供分布式的协同交流和资料管理等方面的支持。
+                     title="项目是一种由用户创建的基于网络的协作空间，能够为个人或小组提供分布式的协同交流和资料管理等方面的支持。
                             项目托管平台：http://forge.trustie.ne">：
               </label>
               <%= f.select :project_id,options_for_select(user_projects_option), {},{:class => "w350 bo"}  %>
@@ -68,14 +57,11 @@
             </p>
             <div class="cl"></div>
             <p>
-              <fieldset style="text-align: left;">
+              <label style="float: left;">&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                <legend>
+              <%#= render :partial => 'attachments/form' %>
-                  <%= l(:label_attachment_plural) %>
+              <p style=" padding: 3px 0 3px 0;padding-left: 90px;">
-                </legend>
+                <%= render :partial => 'attachments/form' %>
-                <p style=" padding: 3px 0 3px 0;padding-left: 50px;  clear:left;">
+              </p>
-                  <%= render :partial => 'attachments/form' %>
-                </p>
-              </fieldset>
             </p>
 
             <p>
@@ -86,25 +72,10 @@
                 <%= l(:label_button_ok)  %>
               </a>
               <a href="javascript:history.back()" class="tijiao">取&nbsp;&nbsp;消</a>
-
-              <!--<a href="#" target="_blank" class="tijiao">-->
-                <!--重&nbsp;&nbsp;置-->
-              <!--</a>-->
             <div class="cl"></div>
             </p>
-          <% end %>
+        <% end %>
-
+      </div><!---创建作业内容结束-->
-        </div><!---创建作业内容结束-->
-
-      </div>
     </div>
   </div>
-
-
 </div><!--新建作业结束-->
-
-
-
-</div>
-</body>
-</html>

public/stylesheets/css.css

@@ -118,7 +118,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 
 
 /* 创建作业 */
-.Newwork{ width:940px; height:auto; border:1px solid #c3c3c3;}
+.Newwork{ width:940px; border:1px solid #c3c3c3;}
 .N_top{ height:35px; background:#e5e5e5; border:1px solid #fff; width:691px; padding:5px 10px 0 15px;}
 .N_top h2{ color:#616161; font-size:14px; float:left;}
 .N_top a{ float:right; font-size:14px; color:#15bccf; display:block; background:url(images/pic_ad.png) 0 5px no-repeat; height:20px; width:60px; padding-left:16px;}
@@ -131,6 +131,15 @@ a:hover.ping_sub{ background:#14a8b9;}
 .bo{height:26px; border:1px solid #CCC !important; padding: 0 !important;}
 a.tijiao{ height:28px !important; display:block !important; width:80px !important; color:#fff !important; background:#15bccf !important; text-align:center !important; padding-top:4px !important; float:left !important; margin-right:10px !important;}
 a:hover.tijiao{ background:#0f99a9 !important;}
+.members_left{ float:left; width:570px;  margin-right:20px;}
+.members_left{}
+.members_left ul li{ height:30px; border-bottom:1px solid #CCC;  width:570px; padding-top:5px; }
+.members_left ul li a{ float:left;}
+.members_left ul li span{ float:left; text-align:center; color:#484747;}
+.w260{ text-align:center; width:260px;}
+.f_b{ font-weight: bold;}
+.members_right label{ margin-left:15px;}
+.N_search{ height:20px; border:1px s #999;}
 
 /* 匿名评分弹框 */
 .alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-490px;background:url(images/close.png) no-repeat;cursor:pointer;}