Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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">
+      <li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
-        <option value="Chinese" selected="selected">中文</option>
+        <select class="languageBox">
-        <option value="English">英文</option>
+          <option value="Chinese" selected="selected">中文</option>
-      </select></li>
+          <option value="English">英文</option>
+        </select>
+      </li>
     </ul>
   </div>
 

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' %>

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">

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 %>