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

app/views/account/login.html.erb

@@ -168,7 +168,7 @@
         <div class="loginChooseBox">
           <div class="mb5">
           <ul class="loginChooseList">
-            <li class="loginChoose fl"><span class="loginChooseTab">登陆</span></li>
+            <li class="loginChoose fl"><span class="loginChooseTab">登录</span></li>
             <li class="loginChooseBorder fl"></li>
           </ul>
         </div>
@@ -206,7 +206,7 @@
             </a></div>
         <% end %>
           <div class="loginInButton" >
-            <a href="javascript:void(0);" class="c_white db" onclick="login();">登陆</a>
+            <a href="javascript:void(0);" class="c_white db" onclick="login();">登录</a>
           </div>
 
         </div>