From b696aa3362627faf0022147a15b224ce9d7d81d7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 16 Oct 2014 11:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E5=85=A5=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_join_private_course.html.erb | 4 ++--
 app/views/welcome/_more_course.html.erb         | 2 ++
 app/views/welcome/course.html.erb               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index 2c616027e..592c79ba1 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -36,7 +36,7 @@
     }
 </style>
 
-<h3 class="title">请输入课程密码</h3>
+<h3 class="title">请输入相关信息</h3>
 
 <%= form_tag({:controller => 'courses',
               :action => 'join'},
@@ -48,7 +48,7 @@
       <%= text_field_tag 'object_id', nil, :style=>'width:80%'%>
     </div>
     <div>
-      <span>密码：</span>
+      <span>密码&nbsp;&nbsp;&nbsp;：</span>
       <%= text_field_tag 'course_password', nil, :style=>'width:80%'%>
     </div>
 
diff --git a/app/views/welcome/_more_course.html.erb b/app/views/welcome/_more_course.html.erb
index c871e7f97..d48050a63 100644
--- a/app/views/welcome/_more_course.html.erb
+++ b/app/views/welcome/_more_course.html.erb
@@ -3,6 +3,8 @@
         <%= link_to(l(:label_course_new), {:controller => 'courses', :action => 'new'},
                     :class => 'icon icon-add') if User.current.allowed_to?(:add_course,nil, :global => true) %>
     <% end %>
+    &nbsp;&nbsp;&nbsp;&nbsp;
 <% end %>
+<%= link_to "加入课程", join_private_courses_courses_path ,:remote => true, :class => 'icon icon-add' %>
 &nbsp;&nbsp;&nbsp;&nbsp;
 <%= link_to l(:label_more), {:controller => 'courses', :action => 'index', :school_id => school_id} %>
\ No newline at end of file
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index b3c1341a4..b9eec5014 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -128,7 +128,7 @@
     <%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE"} %>
     <%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE"} %>
     <!-- 加入课程按钮 -->
-    <%#= link_to "加入私有课程", join_private_courses_courses_path ,:remote => true %>
+
   </h3>
   <span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>