Merge remote-tracking branch 'origin/szzh' into szzh

app/views/courses/settings.html.erb

@@ -23,6 +23,7 @@
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
             <input  type="text" name="course[name]" id="course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name();" value="<%= @course.name%>">
             <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空</span>
+            <input type="password" style="top: -100000px;position: fixed;">
           </li>
           <div class="cl"></div>
           <li  class="ml45">

app/views/forums/_show_topics.html.erb

@@ -1,5 +1,4 @@
-<!-- added by fq -->
-<!--display the board-->
+<script>$(function(){$("img").removeAttr("alt");});</script>
 <div class="borad-topic-count">共有 <%=link_to @forum.memos.count %> 个贴子</div>
 <div style="padding-top: 10px">
 <% if memos.any? %>

app/views/layouts/base_users.html.erb

@@ -68,7 +68,7 @@
                                 </tr>
                                 <tr>
                                     <td>
-                                        <%=link_to l(:field_homepage), home_path %> >                                    
+                                        <%=link_to l(:field_homepage), home_path %> >
                                         <span>
                                           <%=link_to @user.name, user_path %>
                                         </span>
@@ -122,7 +122,7 @@
 											<strong class="font_small_watch">
                                               <%= link_to l(:label_user_watcher)+"("+User.watched_by(@user.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist"%>
                                             </strong> &nbsp;
-											
+
 											<strong class="font_small_watch">
                                               <%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@user.watcher_users.count.to_s+")", :controller=>"users", :action=>"user_fanslist" %>
                                             </strong>&nbsp;&nbsp;
@@ -190,16 +190,16 @@
 											<% unless @user.user_extensions.nil? %>
                                                 <% if @user.user_extensions.identity == 0 || @user.user_extensions.identity == 1 %>
                                                 <tr>
+                                                  <% unless @user.user_extensions.school.nil? %>
                                                     <td style=" float: right" width="70px">
                                                       <span style="float: right"><%= l(:field_occupation) %>：</span>
                                                     </td>
                                                     <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
-                                                        <% unless @user.user_extensions.school.nil? %>
                                                         <a href="http://course.trustie.net/?school_id=<%= @user.user_extensions.school.id%>"><%= @user.user_extensions.school.name  %></a>
-                                                        <% end %>
                                                     </td>
+                                                  <% end %>
                                                 </tr>
-                                                  <% elsif @user.user_extensions.identity == 3 %>
+                                                  <% elsif @user.user_extensions.identity == 3 && @user.user_extensions.occupation.empty? %>
                                                   <tr>
                                                     <td style=" float: right" width="70px">
                                                      <span style="float: right"> <%= l(:field_occupation) %>：</span>

app/views/school/index.html.erb

@@ -18,9 +18,6 @@
             }
         })
     });
-</script>
-
-<script type="text/javascript">
     function get_school(value){
         var prefix = '';
         if(location.href.indexOf('ros') >= 0)
@@ -36,14 +33,9 @@
             }
         })
     }
-</script>
-
-<script type="text/javascript">
     function test(id){
         location.href = encodeURI('http://<%= Setting.host_course %>/?school_id='+id);
     }
-</script>
-<script type="text/javascript">
     function ssearch(){
         //alert($("#key_word").val());
         var value = $("#key_word").val();

public/stylesheets/application.css

@@ -7,6 +7,7 @@ h2, .wiki h1 {font-size: 20px;}
 h3, .wiki h2 {font-size: 15px; padding-left: 5px}
 h4, .wiki h3 {font-size: 13px;}
 h4 {border-bottom: 1px dotted #bbb;}
+li{list-style-type:none;}
 /*huang*/
 /*current position*/
 .contest_count{