From cea01b4df5795da45bcf43a5e0a0e4823fe6c496 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Wed, 14 May 2014 18:33:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/index.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 0d9a3a21f..08052f11e 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -296,7 +296,7 @@
                     if (textStatus == 'success') {
                         eval(xhr.responseText);
                     } else if (textStatus == 'error') {
-                        alert('error');
+                        alert('An error has occurred');
                     }
                 });
     }
@@ -312,7 +312,7 @@
                     if (textStatus == 'success') {
                         eval(xhr.responseText);
                     } else if (textStatus == 'error') {
-                        alert('error');
+                        alert('An error has occurred');
                     }
                     ;
                 });
@@ -331,7 +331,7 @@
                     if (textStatus == 'success') {
                         eval(xhr.responseText);
                     } else if (textStatus == 'error') {
-                        alert('error');
+                        alert('An error has occurred');
                     }
                     ;
                 });
@@ -350,7 +350,7 @@
                             type: "POST"
                         });
                     } else if (textStatus == 'error') {
-                        alert('error');
+                        alert('An error has occurred');
                     }
                 });
     }

From 81596d674b34869c0b1bff12f11d792da94ba7f1 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Thu, 15 May 2014 09:20:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E4=BA=86=E6=B8=A9?=
 =?UTF-8?q?=E9=A6=A8=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_projects.html.erb  | 2 +-
 app/views/users/watch_projects.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb
index 6b218a97d..ffb420339 100644
--- a/app/views/users/user_projects.html.erb
+++ b/app/views/users/user_projects.html.erb
@@ -1,6 +1,6 @@
 <!--add by huang-->
 <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => 0}, :class => 'icon icon-add') if(User.current.allowed_to?(:add_project, nil, :global => true) && @user == User.current)%>
-<span class="font_lighter" >温馨提示：项目可以是一次作业，也可以是别人或者自己创建的一项小工程~</span>
+<!--span class="font_lighter" >温馨提示：项目可以是一次作业，也可以是别人或者自己创建的一项小工程~</span-->
 <%= watch_projects @state %>
 <% unless @memberships.empty? %>
 <div class="content_frame">
diff --git a/app/views/users/watch_projects.html.erb b/app/views/users/watch_projects.html.erb
index 7842e6d52..42047d4ea 100644
--- a/app/views/users/watch_projects.html.erb
+++ b/app/views/users/watch_projects.html.erb
@@ -1,5 +1,5 @@
 <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => 0}, :class => 'icon icon-add') if(User.current.allowed_to?(:add_project, nil, :global => true) && @user == User.current)%>
-<span class="font_lighter" >温馨提示：项目可以是一次作业，也可以是别人或者自己创建的一项小工程~</span>
+<!--span class="font_lighter" >温馨提示：项目可以是一次作业，也可以是别人或者自己创建的一项小工程~</span-->
 <%= watch_projects @state%>
 <% if @watch_projects.count > 0 %>
 <% for watch_project in @watch_projects %>