From 659ff254e1683180b16df7f9b8b0c5f87c1abe73 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 15 May 2015 17:12:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?background=E8=83=8C=E6=99=AF=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=8B=89=E4=BC=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/application.css | 5 +++--
 public/stylesheets/courses.css     | 1 +
 public/stylesheets/project.css     | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 35e41453e..edde12527 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1598,7 +1598,8 @@ blockquote {
 	margin-right: 0.4em;
 	border-radius: 4px;
 	font-family: "Microsoft YaHei";
-	background: url('../images/requirements/reference.jpg')
+	background: url('../images/requirements/reference.jpg');
+    background-size: 100% 100%;
 }
 
 blockquote blockquote { margin-left: 0;}
@@ -2780,4 +2781,4 @@ div.repos_explain{
 	padding-top: 20px;
 	padding-bottom: 20px;
 }
-.upload_img img{max-width: 580px;width: 100%;}
+.upload_img img{max-width: 100%;}
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 132cddadc..5333b91a7 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -487,6 +487,7 @@ blockquote {
     border-radius: 4px;
     font-family: "Microsoft YaHei";
     background: url('../images/requirements/reference.jpg');
+    background-size: 100% 100%;
 }
 a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;}
 .min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 74d7c58b3..d6bef6524 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -388,6 +388,7 @@ blockquote {
     border-radius: 4px;
     font-family: "Microsoft YaHei";
     background: url(http://test.forge.trustie.net/images/requirements/xreference.jpg.pagespeed.ic.h4inUJNyH0.jpg);
+    background-size: 100% 100%;
 }
 /*上传项目图片*/
 .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}

From b84f6280c259d76dc815f065170a360976b9cc74 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 15 May 2015 17:29:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?wiki=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_form_project.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/attachments/_form_project.html.erb b/app/views/attachments/_form_project.html.erb
index 998766b27..d1cdf8cc9 100644
--- a/app/views/attachments/_form_project.html.erb
+++ b/app/views/attachments/_form_project.html.erb
@@ -125,9 +125,9 @@
                                  :file_count => l(:label_file_count),
                                  :delete_all_files => l(:text_are_you_sure_all)
                          } %>
-      <% if container.nil? %>
-    <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
- <% end %>
+      <% if defined?(container) %>
+        <span id="upload_file_count" class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+     <% end %>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 

From 0e6c15c160ebb408d7bf6bed7c0f1f26b5159c7a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 15 May 2015 17:36:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8Flogo=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/avatar/_avatar_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb
index 43aaf9132..632ea5d4d 100644
--- a/app/views/avatar/_avatar_form.html.erb
+++ b/app/views/avatar/_avatar_form.html.erb
@@ -43,7 +43,7 @@
     	<div id="upload_progressbar" style="height:14px; margin-bottom: 10px;display: block"></div>
     </div>
 </span>
-<%= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "btn_addPic", :style => "text-decoration:none;" %>
+<%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "btn_addPic", :style => "text-decoration:none;" %>
   <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
 	<span><%= l(:button_upload_photo) %></span>
   </a>