From ba84e19048648813cd5350e6ccc4b5458f357686 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 4 Aug 2015 17:06:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer_public.html.erb | 10 ++++++----
 app/views/layouts/base_courses.html.erb        |  2 +-
 app/views/layouts/base_projects.html.erb       |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_base_footer_public.html.erb b/app/views/layouts/_base_footer_public.html.erb
index d4fc3e7e5..dba26f1f6 100644
--- a/app/views/layouts/_base_footer_public.html.erb
+++ b/app/views/layouts/_base_footer_public.html.erb
@@ -6,10 +6,12 @@
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
       <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
       <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
-      <li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a><select class="languageBox">
-        <option value="Chinese" selected="selected">中文</option>
-        <option value="English">英文</option>
-      </select></li>
+      <li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
+        <select class="languageBox">
+          <option value="Chinese" selected="selected">中文</option>
+          <option value="English">英文</option>
+        </select>
+      </li>
     </ul>
   </div>
 
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index fb29439a8..7a32cb67d 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -180,7 +180,7 @@
   </div><!--Content end-->
   <div class="cl"></div>
 
-  <%= render :partial => 'layouts/base_footer_public' %>
+  <%= render :partial => 'layouts/new_footer' %>
   <div class="cl"></div>
 </div><!--Container end-->
 <%= render :partial => 'layouts/new_feedback' %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 74b876391..74c13cc8e 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -173,7 +173,7 @@
   </div>
   <div style="clear:both;"></div>
   <div class="cl"></div>
-  <%= render :partial => 'layouts/base_footer_public'%>
+  <%= render :partial => 'layouts/new_footer'%>
   <div class="cl"></div>
 </div><!--Container end-->
 <div id="light" class="white_content02">

From 69adc98fe4e7a23134b9f304df9f4b4d10733ae8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 4 Aug 2015 17:26:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 18d0a1f5b..0513f49ce 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -169,7 +169,7 @@
 
       <div class="cl"></div>
 
-      <div class="leftbox">
+      <div class="leftbox mt10">
         <ul class="leftbox_ul_left">
           <% if @user.user_extensions && @user.user_extensions.identity == 0 %>
             <% if(get_create_course_count(@user)) != 0 %>