From 1bfb2918f077f8801d13134f1a3236b6ff7a545d Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 1 Jul 2016 20:06:12 +0800
Subject: [PATCH] =?UTF-8?q?KE=E9=97=B4=E8=B7=9D=E6=94=B9=E5=9B=9E=E5=8E=9F?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E9=99=84=E4=BB=B6=E5=88=A0=E9=99=A4=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8D=9A?=
 =?UTF-8?q?=E5=AE=A2=E6=A0=87=E9=A2=98=E4=B8=8E=E7=BD=AE=E9=A1=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb   |  2 +-
 app/views/attachments/_form_course.html.erb | 12 ++++++------
 public/stylesheets/courses.css              |  3 +--
 public/stylesheets/new_user.css             |  1 -
 public/stylesheets/project.css              |  1 -
 public/stylesheets/public.css               |  3 +--
 public/stylesheets/syllabus.css             |  2 +-
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 960bc61e6..a6b5f09cf 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -612,7 +612,7 @@ class AttachmentsController < ApplicationController
         @attachment.container.board.course)
       @course = @attachment.container.board.course
     else
-      unless @attachment.container_type == 'Bid' ||  @attachment.container_type == 'Organization' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWork'
+      unless @attachment.container_type == 'Syllabus' || @attachment.container_type == 'Bid' ||  @attachment.container_type == 'Organization' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWork'
         @project = @attachment.project
       end
     end
diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb
index 6d921903d..1d51e951a 100644
--- a/app/views/attachments/_form_course.html.erb
+++ b/app/views/attachments/_form_course.html.erb
@@ -2,31 +2,31 @@
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
-    <span id="attachments_p<%= i %>" class="sub_btn">
+    <p id="attachments_<%= i+1 %>" class="sub_btn">
 
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
       <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
       <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
       <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
-      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "#{i+1}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload', :containerid => "2") %>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
-    </span>
+    </p>
   <% end %>
   <% else %>
   <% container.attachments.each_with_index do |attachment, i| %>
-     <span id="attachments_p<%= i %>" class="attachment">
+     <p id="attachments_<%= i+1 %>" class="attachment">
 
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
        <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
        <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
        <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
-       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "#{i+1}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload', :containerid => "2") %>
        <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
 
        <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
-    </span>
+    </p>
   <% end %>
   <% end %>
 <% end %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 96c9947b1..178e9bb5d 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -152,7 +152,6 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro p{line-height: 1;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -1429,4 +1428,4 @@ a.pages-big{ width:50px;}
 .W300 {width:300px !important;}
 .W600{ width:600px;}
 
-.syllabus_input {width: 290px; border: 1px solid #64bdd9; height: 30px;}
+.syllabus_input {width: 290px; border: 1px solid #64bdd9; height: 30px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index a65edc490..b931dff6b 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -683,7 +683,6 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro p{line-height: 1;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
 .borderBottomNone {border-bottom:none !important;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 354c0f1ac..bde560613 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -969,7 +969,6 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     color: #484848;
     overflow: hidden;
 }
-.homepagePostIntro p{line-height: 1;}
 .homepagePostReply {
     width: 710px;
     margin: 10px auto 0px;
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 7cfb7f9e0..c86e0f42d 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -633,7 +633,6 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro p{line-height: 1;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
@@ -1184,4 +1183,4 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
 .reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
 
 /*20160622代码分析弹窗*/
-.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
+.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index 6218f52e0..2abbffda7 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -138,7 +138,7 @@ a.sortupbtn{ background: url(../images/syllabus/icons_syllabus.png) 0 3px no-rep
 a.sortdownbtn{ background: url(../images/syllabus/icons_syllabus.png) 0 -12px no-repeat; width:12px; height:17px; display:block;cursor:pointer; }
 a.sort_no{ background: url(../images/syllabus/icons_syllabus.png) -16px -12px no-repeat; width:12px; height:17px; display:block;cursor:pointer; }
 .item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;}
-a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:708px;}
+a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block;}
 a:hover.list-title{ color:#269ac9;}
 .c_red{ font-weight:normal; font-size:12px;}
 .list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}