From 404421c745d4b20306838a70d4df1e344459b0bc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 15 May 2015 15:09:33 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E7=9A=84alt=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/_show_topics.html.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb
index e61995ecc..9af8538ed 100644
--- a/app/views/forums/_show_topics.html.erb
+++ b/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? %>

From 99e3d09e83f924254ec83079c9e4136a8d92ec01 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 15 May 2015 15:17:47 +0800
Subject: [PATCH 2/4] =?UTF-8?q?IE=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=ADli?=
 =?UTF-8?q?=E5=89=8D=E9=9D=A2=E6=9C=89=E4=B8=AA=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/school/index.html.erb    | 8 --------
 public/stylesheets/application.css | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb
index aeb7d0943..00f419aab 100644
--- a/app/views/school/index.html.erb
+++ b/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();
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4c149c9ce..8062ee6ea 100644
--- a/public/stylesheets/application.css
+++ b/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{	

From 6566a044d2a42ba86bbe5408ce3a9a9aabecf933 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 15 May 2015 15:38:38 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A0=E5=B7=A5=E4=BD=9C=E5=9C=B0?=
 =?UTF-8?q?=E7=82=B9=E5=B0=B1=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 651067475..1f74ccd5d 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/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>

From ea1a98f8acd1206bf7ad1ed9e8d984c42323ac83 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 15 May 2015 16:02:33 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88--=E6=90=9C?=
 =?UTF-8?q?=E7=8B=97=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=AD=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E4=B8=BA=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E7=9A=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/settings.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index 69ce4f5dc..4ca8d3d43 100644
--- a/app/views/courses/settings.html.erb
+++ b/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">