From 7c804a6f7736ebebd8bd685b059427f911040fee Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 13 Oct 2017 22:52:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?PHTWeb=E5=AE=9E=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb  | 2 +-
 app/views/games/_code_actions.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index c7a2dd605..cf01a172f 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -626,7 +626,7 @@ class ShixunsController < ApplicationController
         user_gid = User.find_by_mail("eduforge@163.com").try(:gid)
         gshixun = g.fork(@shixun.gpid, user_gid)
         raise "版本库创建失败" if gshixun.try(:id).blank?
-        gshixun = g.edit_project(gshixun.id, new_shixun.identifier, new_shixun.identifier)
+        #gshixun = g.edit_project(gshixun.id, new_shixun.identifier, new_shixun.identifier)
         raise "实训复制失败" if (gshixun.try(:name) != new_shixun.identifier || gshixun.try(:path) != new_shixun.identifier)
         new_shixun.update_column(:gpid, gshixun.id)
         # 同步复制者至gitlab,必须要求用户绑定了邮箱
diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb
index 37598d856..f440a4f91 100644
--- a/app/views/games/_code_actions.html.erb
+++ b/app/views/games/_code_actions.html.erb
@@ -2,7 +2,7 @@
 <!--<span class="mt10 mr15" style="color: #2dad96;" id="game_wating_time"></span>-->
 <% if @myshixun.shixun.try(:language) == "PHP/Web" %>
     <div id="php_display" class="undis">
-      <a href="<%= "http://106.75.96.108:" + (50000 + @game.myshixun_id).to_s + '/' + @game.challenge.path.strip %>" target="_blank" class="shixun-task-btn task-btn-orange mr15 mt8">
+      <a href="<%= Redmine::Configuration['tomcat_php'] + ':' + (50000 + @game.myshixun_id).to_s + '/' + @game.challenge.path.strip %>" target="_blank" class="shixun-task-btn task-btn-orange mr15 mt8">
         查看网页效果
       </a>
 <!--

From 6b8956e9ef7e50676a651dbabe263bd54507973c Mon Sep 17 00:00:00 2001
From: XuCheng642 <287102909@qq.com>
Date: Fri, 13 Oct 2017 23:28:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=8E=BB=E9=99=A4=E7=82=B9=E5=87=BB=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=20=20=E8=AF=BE=E7=A8=8B=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/managements_controller.rb |  4 ++--
 app/views/users/show.html.erb             | 14 +++++++++-----
 public/stylesheets/css/edu-class.css      |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index c0b797c4c..198917000 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -889,10 +889,10 @@ end
           user_id = User.where("concat(lastname, firstname) like '%#{search}%'")
           @courselist  = @courselist.includes(:user).where("concat(users.lastname, users.firstname) like '%#{search}%'")
         else
-          @courselist= @courselist.where("name like '%#{search}%'")
+          @courselist = @courselist.where("name like '%#{search}%'")
         end
     end
-    @courselist = @courselist.order("id #{@sx_order}")
+    @courselist = @courselist.order("created_at #{@sx_order}")
     @courselist_count = @courselist.count
     limit = 20
     @is_remote = true
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 98fe4b9ce..40a375f7e 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -3,12 +3,16 @@
 <div class="-task-con">
 
 <div class="-task-con-per box_bg_shandow bor-grey-e cl">
-  <div class="photo fl" onclick="window.open('<%=avatar_account_path%>')">
-    <%= image_tag(url_to_avatar(@user), :class => "person",:width => 100, :height => 100, :alt => "头像") %>
-    <% if current_user %>
+  <% if current_user %>
+      <div class="photo fl" onclick="window.open('<%=avatar_account_path%>')">
+        <%= image_tag(url_to_avatar(@user), :class => "person",:width => 100, :height => 100, :alt => "头像") %>
         <div class="changephoto font-14"><a href="<%= avatar_account_path %>" class="subchange" style="display: block" target="_blank" >更换头像</a></div>
-    <% end %>
-  </div>
+      </div>
+  <% else %>
+      <div class="photo fl">
+        <%= image_tag(url_to_avatar(@user), :class => "person",:width => 100, :height => 100, :alt => "头像") %>
+      </div>
+  <% end %>
   <div class="-task-con-data fl">
     <div class="top cl">
       <div class="top-left fl">
diff --git a/public/stylesheets/css/edu-class.css b/public/stylesheets/css/edu-class.css
index 0aa962049..f7621c6ff 100644
--- a/public/stylesheets/css/edu-class.css
+++ b/public/stylesheets/css/edu-class.css
@@ -326,7 +326,7 @@ img.ui-datepicker-trigger {display:block;background:url(../images/public_icon.pn
 .edu-class-innner-conbox{ background:#fff;}
 .edu-class-con-list{ padding:10px 0; border-bottom:1px solid #eee;}
 .edu-class-con-list .edu-bg-grey{ background:#f5f5f5;}
-a.edu-class-inner-list{display: block;  color:#333; font-size: 16px; max-width:87%; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
+a.edu-class-inner-list{display: block;  color:#333; font-size: 16px; max-width:77%; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
 a:hover.edu-class-inner-list{color:#FF7500!important;}
 .popup_tip_box {position: absolute; padding: 5px 15px; display: inline-block;white-space: nowrap; background-color: #FFFEF4;border: 1px solid #F3DDB3;  color:#888; font-size:12px;}
 .popup_tip_box em { display: block; border-width: 9px; position: absolute; top: 5px; left: -18px;