From 05c74960a8f2773eaefb6e26fc3338f1bf264337 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 16 Apr 2015 15:01:37 +0800
Subject: [PATCH 1/6] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E9=80=89=E6=8B=A9=E7=9A=84TAG=E4=BA=91=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=202=E3=80=81=E5=BD=93=E9=80=89=E6=8B=A9TAG?=
 =?UTF-8?q?=E4=BA=91=E8=BF=87=E6=BB=A4=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?TAG=E8=BF=9B=E8=A1=8C=E6=B7=BB=E5=8A=A0=E3=80=81=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=93=8D=E4=BD=9C=E6=97=B6=E7=BB=A7=E7=BB=AD=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E8=AF=A5TAG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/tags_controller.rb    | 2 ++
 app/views/files/_course_list.html.erb | 6 +++---
 app/views/files/_tag_yun.html.erb     | 6 +++++-
 app/views/tags/_tag_add.html.erb      | 2 ++
 app/views/tags/_tag_list.html.erb     | 3 ++-
 app/views/tags/_tag_new.html.erb      | 3 ++-
 app/views/tags/remove_tag_new.js.erb  | 4 ++--
 app/views/tags/tag_save.js.erb        | 4 ++--
 8 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index f1c9451bf..253faa2b1 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -224,12 +224,14 @@ class TagsController < ApplicationController
       if @obj && @object_flag == '6' && @obj.container.kind_of?(Course)
         @course = @obj.container
         @tag_list = get_course_tag_list @course
+        @select_tag_name = params[:select_tag_name]
       end
       # end
     end
   end
 
   def tag_save
+    @select_tag_name = params[:tag_for_save][:tag_name]
     @tags = params[:tag_for_save][:name]
     @obj_id = params[:tag_for_save][:object_id]
     @obj_flag = params[:tag_for_save][:object_flag]
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index c726d63e7..42f51e07a 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -16,7 +16,7 @@
 <div class="cl"></div>
 
 <div class="files_tag" id="files_tag">
-    <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course}%>
+    <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => course,:tag_name => @tag_name}%>
 </div>
 <div class="cl"></div>
 
@@ -52,8 +52,8 @@
       </div>
       <div class="cl"></div>
       <div class="tag_h">
-        <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
-        <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
+        <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+        <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
       </div>
       <div class="cl"></div>
     </div><!---re_con_box end-->
diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb
index f78ea6cdf..c9ac1999f 100644
--- a/app/views/files/_tag_yun.html.erb
+++ b/app/views/files/_tag_yun.html.erb
@@ -1,5 +1,9 @@
 <% unless tag_list.nil?%>
     <% tag_list.each do |k,v|%>
-        <a href="javascript:void(0);" class="files_tag_icon" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"><%= k%>（<span class="c_red"><%= v%></span>）</a>
+        <% if tag_name && tag_name == k%>
+            <a href="javascript:void(0);" class="files_tag_icon" style="background: #28be6c;"><%= k%>（<span class="c_red"><%= v%></span>）</a>
+        <% else%>
+            <a href="javascript:void(0);" class="files_tag_icon" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"><%= k%>（<span class="c_red"><%= v%></span>）</a>
+        <% end%>
     <% end%>
 <% end%>
\ No newline at end of file
diff --git a/app/views/tags/_tag_add.html.erb b/app/views/tags/_tag_add.html.erb
index f8cac7c0d..ad97cd693 100644
--- a/app/views/tags/_tag_add.html.erb
+++ b/app/views/tags/_tag_add.html.erb
@@ -9,6 +9,8 @@
       <%= f.text_field :name ,:id => "tags_name_#{obj.id}",:size=>"28",:require=>true,:maxlength => Setting.tags_max_length,:minlength=>Setting.tags_min_length,:class => "isTxt w90 f_l" %>
       <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%>
       <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%>
+      <% tag_name ||= ""%>
+      <%= f.text_field :tag_name,:value=> tag_name,:style=>"display:none"%>
       <%= f.submit "",:class => "submit f_l" %>
     </span>
 <% end %>
diff --git a/app/views/tags/_tag_list.html.erb b/app/views/tags/_tag_list.html.erb
index e18dafd7d..b512f1ef3 100644
--- a/app/views/tags/_tag_list.html.erb
+++ b/app/views/tags/_tag_list.html.erb
@@ -12,8 +12,9 @@
 			<% end %>
           <% when '6' %>
           <% if obj.author_id == User.current.id || User.current.admin?%>
+              <% select_tag_name ||= ""%>
 		        <span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag_new", :remote => true, :tag_name => tag,
-                                               :taggable_id => obj.id, :taggable_type => object_flag %> </span>
+                                               :taggable_id => obj.id, :taggable_type => object_flag, :select_tag_name => select_tag_name %> </span>
 			<% end %>
 	    <% end %>
     </span>
diff --git a/app/views/tags/_tag_new.html.erb b/app/views/tags/_tag_new.html.erb
index 0d5d371e3..bbedaff78 100644
--- a/app/views/tags/_tag_new.html.erb
+++ b/app/views/tags/_tag_new.html.erb
@@ -21,7 +21,8 @@
       </div>
   <% elsif object_flag == '6' %>
       <div id="tags_show-<%=obj.class%>-<%=obj.id%>" style="display:inline; ">
-        <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag} %>
+        <% tag_name ||= ""%>
+        <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name} %>
       </div>
       <div id="put-tag-form-<%=obj.class%>-<%=obj.id%>" style="display: none;height: 100px;">
         <%= render :partial => "courses/course_resources_html", :locals => {:obj => obj ,:object_flag => object_flag } %>
diff --git a/app/views/tags/remove_tag_new.js.erb b/app/views/tags/remove_tag_new.js.erb
index 35361fc7d..9a43dd9b4 100644
--- a/app/views/tags/remove_tag_new.js.erb
+++ b/app/views/tags/remove_tag_new.js.erb
@@ -2,9 +2,9 @@
 <% if @object_flag == "6"%>
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
-                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag}) %>');
+                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @object_flag,:select_tag_name => @select_tag_name}) %>');
 
-$("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course}) %>");
+$("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
 <% end %>
 <% if @object_flag == "10"%>
 $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
diff --git a/app/views/tags/tag_save.js.erb b/app/views/tags/tag_save.js.erb
index 2c0c398f4..74a38c99d 100644
--- a/app/views/tags/tag_save.js.erb
+++ b/app/views/tags/tag_save.js.erb
@@ -8,8 +8,8 @@ $('#name-issue').val("");
     <%if @course%>
         $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
         $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
-                     :locals => {:obj => @obj,:object_flag =>  @obj_flag}) %>');
-        $("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course}) %>");
+                     :locals => {:obj => @obj,:object_flag =>  @obj_flag,:select_tag_name => @select_tag_name}) %>');
+        $("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
     <%else%>
         $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
         $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/course_attachment_tag_name',

From 4202ec4bad486c956d7b03ec777892cb7e24f90c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 16 Apr 2015 15:27:49 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/application.css | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b42efdabd..4b6b681c7 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -641,7 +641,6 @@ span.forums-avatar-right{
 /*added by bai*/
 .user_underlinescore{
 	margin: 1px;
-	padding: 1px;
 	width:700px;
 	height:1px;
 	background-color:#15bccf;
@@ -1106,7 +1105,6 @@ ul.user_course_sort li{list-style-type:none;
 }
 .user_underline{
 	margin:1px;
-	padding:1px;
 	width:240px;
 	height:1px;
 	background-color:#15bccf;
@@ -1126,7 +1124,6 @@ ul.user_course_sort li{list-style-type:none;
 
 .user_underline2{
 	margin:1px;
-	padding:1px;
 	width:240px;
 	height:1px;
 	background-color:#c6e9fe;
@@ -1134,7 +1131,6 @@ ul.user_course_sort li{list-style-type:none;
 }
 .user_underline3{
 	margin: 1px;
-	padding:1px;
 	width:120px;
 	height:1px;
 	background-color:#c6e9fe;
@@ -1143,7 +1139,6 @@ ul.user_course_sort li{list-style-type:none;
 }
 .homepage_underline{
 	margin:1px;
-	padding:1px;
 	width:240px;
 	height:1px;
 	background-color:#c6e9fe;
@@ -3063,7 +3058,6 @@ div.repos_explain{
 /* new linchun compitition */
 .contest_underline{
 	margin:1px;
-	padding:1px;
 	width:900px;
 	height:0.5px;
 	background-color:#aaa;

From 6983764c445600847c7a80560056e7b44d18c4d3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 16 Apr 2015 15:41:50 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E6=97=B6=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb | 4 ++--
 public/stylesheets/public.css           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index dec4a5f4d..dc384834c 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -35,7 +35,7 @@
           <%= l(:label_courses_community)%>
         </a>
       </h2>
-      <p>
+      <p class="hiddent">
         <%= l(:label_user_location) %> :
         <%= link_to l(:field_homepage), home_path %>
         >
@@ -80,7 +80,7 @@
         <div class="cl"></div>
 
         <div >
-          <a class="pr_info_name fl c_dark fb" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
+          <a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
             <%= @course.name %>
             <% if @course.is_public == 0%>
                 <span class="img_private ">
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 45568c913..9d714b1de 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -279,6 +279,7 @@ a:hover.close_btn {background-position:-66px 0;}
 .show_btn {background-position:-119px 0;}
 .msgserver a {color:#15bccf; }
 .break_word{word-break: break-all;word-wrap: break-word;}
+.hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .break_word_firefox{white-space: pre-wrap;word-break: break-all;}
 
 

From 45d5f9e58b1c01023141379cf51cf0040c6a442c Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 16 Apr 2015 15:48:15 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=8C=89=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 6f207d76d..e91883bee 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -40,9 +40,9 @@ class CoursesService
     end
     @courses = courses_all.visible(current_user)
     if params[:name].present?
-      @courses_all = @courses.like(params[:name])
+      @courses_all = @courses.like(params[:name]).order("created_at desc")
     else
-      @courses_all =  @courses;
+      @courses_all =  @courses.order("created_at desc");
     end
     @courses_all
     course_list = []

From e4597f9ccc6d5ea3f878595076c1188ffde1af0b Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 16 Apr 2015 15:48:34 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9C=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/users_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/users_service.rb b/app/services/users_service.rb
index 63dd725cd..c1f716fd1 100644
--- a/app/services/users_service.rb
+++ b/app/services/users_service.rb
@@ -77,7 +77,7 @@ class UsersService
     gender = @user.user_extensions.gender.nil? ? 0 : @user.user_extensions.gender
     work_unit = get_user_work_unit @user
     location = get_user_location @user
-    {:id => @user.id, :img_url => img_url, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction}
+    {:id => @user.id, :img_url => img_url,:realname => @user.realname, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction}
   end
 
   #忘记密码

From 61a938ef39a636bea141be413f15f95676dd218b Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 16 Apr 2015 15:48:53 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9C=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/user.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/api/mobile/entities/user.rb b/app/api/mobile/entities/user.rb
index 9112e7ec5..6b0064036 100644
--- a/app/api/mobile/entities/user.rb
+++ b/app/api/mobile/entities/user.rb
@@ -34,6 +34,8 @@ module Mobile
       user_expose :img_url
       #昵称
       expose :nickname
+      #真名
+      expose :realname
       #性别
       user_expose :gender
       #我的二维码