From 1de6e24bfbc4956d680316ae5675ab550456fa83 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 10 Oct 2015 10:04:32 +0800
Subject: [PATCH 1/6] =?UTF-8?q?tag=E6=95=B0=E7=9B=AE=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=96=B9=E5=BC=8F=E7=9A=84=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_tag_yun.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb
index f60a5fb9e..bdf581baa 100644
--- a/app/views/files/_tag_yun.html.erb
+++ b/app/views/files/_tag_yun.html.erb
@@ -6,12 +6,12 @@
     <% tag_list.each do |k,v|%>
         <% if tag_name && tag_name == k%>
             <!-- 鼠标不能移动是因为 href="javascript:void(0);"导致的 -->
-            <span>    <a  class="files_tag_select" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
+            <span>    <a  class="files_tag_select" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>(<%= v%>)</a></span>
         <% else%>
         <span class="files_tag_icon" >
           <a  title="双击可编辑"
               onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"
-              ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
+              ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>(<%= v%>)</a></span>
         <% end%>
     <% end%>
 <% end%>
\ No newline at end of file

From 11abbca1cf1dc3eb51b94b167ac285ef66f5d62f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 10 Oct 2015 10:16:50 +0800
Subject: [PATCH 2/6] =?UTF-8?q?tag=5Flist=E4=BB=A3=E7=A0=81=E7=9A=84?=
 =?UTF-8?q?=E5=85=AC=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_course_list.html.erb       | 2 +-
 app/views/files/_project_file_list.html.erb | 2 +-
 app/views/tags/_tag_list.html.erb           | 4 ++--
 app/views/tags/_tag_new.html.erb            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index bad93f4ae..9e88cb2fd 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -56,7 +56,7 @@
             <div class="cl"></div>
             <div class="tag_h">
               <!-- container_type = 1 代表是课程里的资源 -->
-              <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name,:container_type=>'1'} %>
+              <%= 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>
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index 6e2623c4b..6dc5b6753 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -45,7 +45,7 @@
         <div class="cl"></div>
         <div class="tag_h">
           <!-- container_type = 2 代表是项目里的资源 -->
-          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:container_type=>'2'} %>
+          <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6"} %>
           <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6"} %>
         </div>
         <div class="cl"></div>
diff --git a/app/views/tags/_tag_list.html.erb b/app/views/tags/_tag_list.html.erb
index 3b46480c2..14b6a0597 100644
--- a/app/views/tags/_tag_list.html.erb
+++ b/app/views/tags/_tag_list.html.erb
@@ -2,8 +2,8 @@
 
 <% if @tags.size > 0 %>
     <% @tags.each do |tag| %>
-	<span class="re_tag f_l" style="cursor:<%= container_type == '1' ? 'pointer' :'default' %> " > <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
-      <a title="<%= container_type == '1' ? '双击可编辑' : '' %> " ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
+	<span class="re_tag f_l" style="cursor:<%= obj.container_type == 'Course' ? 'pointer' :'default' %> " > <%#= link_to tag, :controller => "tags", :action => "index", :q => tag,  :object_flag => object_flag, :obj_id => obj.id %>
+      <a title="<%= obj.container_type == 'Course' ? '双击可编辑' : '' %> " ondblclick="rename_tag($(this),'<%= tag %>',<%= obj.id%>,<%= object_flag%>);"><%= tag %></a>
       <!-- 对用户主页 是本人 ，对项目，需求，问题是管理员 -->
       <% case object_flag %>
 	    <% when '10' %>
diff --git a/app/views/tags/_tag_new.html.erb b/app/views/tags/_tag_new.html.erb
index e416776e6..bbedaff78 100644
--- a/app/views/tags/_tag_new.html.erb
+++ b/app/views/tags/_tag_new.html.erb
@@ -22,7 +22,7 @@
   <% elsif object_flag == '6' %>
       <div id="tags_show-<%=obj.class%>-<%=obj.id%>" style="display:inline; ">
         <% tag_name ||= ""%>
-        <%= render :partial => "tags/tag_list",:locals => {:obj => obj,:object_flag => object_flag,:select_tag_name => tag_name,:container_type=>container_type} %>
+        <%= 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 } %>

From 48bd70b9f6e200dfe5c343e32ae61891a5580048 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Sat, 10 Oct 2015 10:23:52 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5d31c3984..f867f7342 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -549,7 +549,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
 .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
 a.UsersEditBtn{ display:block; width:55px; height:20px; border:1px solid #6d6d6d; color:#fff; background:#888888 url(../images/homepage_icon.png) -11px -35px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
-a:hover.UsersEditBtn{ color:#484848;  background:#888888 url(../images/homepage_icon.png) -11px -74px no-repeat;}
+a:hover.UsersEditBtn{ color:#484848;  background:#888888 url(../images/homepage_icon2.png) -11px -74px no-repeat;}
 a.UsersAttBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -9px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
 a:hover.UsersAttBtn{border:1px solid #888888; }
 a.UsersApBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -177px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
@@ -1065,7 +1065,7 @@ a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflo
 .DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}
 
 a.UsersEditBtn{ display:block; width:55px; height:20px; border:1px solid #6d6d6d; color:#fff; background:#888888 url(../images/homepage_icon.png) -11px -35px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
-a:hover.UsersEditBtn{ color:#484848;  background:#888888 url(../images/homepage_icon.png) -11px -74px no-repeat;}
+a:hover.UsersEditBtn{ color:#484848;  background:#888888 url(../images/homepage_icon2.png) -11px -74px no-repeat;}
 a.UsersAttBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -9px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
 a:hover.UsersAttBtn{border:1px solid #888888; }
 a.UsersApBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon2.png) -177px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}

From 9e91429b1e770e73d48f0e84e7f6037df1d0912d Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Sat, 10 Oct 2015 10:32:08 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E5=9C=A8=E4=BE=A7?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=B7=A6=E4=BE=A7=E6=96=87=E5=AD=97=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E4=B8=8D=E5=8F=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/header.css   | 4 ++--
 public/stylesheets/new_user.css | 4 ++--
 public/stylesheets/public.css   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index b6566d628..36dcf1d81 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -43,9 +43,9 @@ a.homepageImageNumber:hover {color:#15bccf;}
 .homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
 .homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
 .homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
-.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
+.homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;}
 .homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
-a.coursesLineGrey {color:#808080; display:block;}
+a.coursesLineGrey {padding-left:25px; color:#808080; display:block;}
 a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#b3e0ee;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 53daa5933..4d8623fd6 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -564,9 +564,9 @@ a.homepageImageNumber:hover {color:#269ac9;}
 .homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
 .homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
 .homepageLeftMenuCourses {font-size:13px; border-bottom:1px solid #dddddd;}
-.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
+.homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;}
 .homepageLeftMenuCoursesLine:hover {background-color:#269ac9;}
-a.coursesLineGrey {color:#808080; display:block;}
+a.coursesLineGrey {padding-left:25px; color:#808080; display:block;}
 a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 90651f362..89073a8f8 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -479,9 +479,9 @@ a.homepageImageNumber:hover {color:#15bccf;}
 .homepageLeftMenuContainer {width:238px; border:1px solid #dddddd; border-bottom:none; background-color:#ffffff; margin-top:10px;}
 .homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
 .homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
-.homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
+.homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;}
 .homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
-a.coursesLineGrey {color:#15bccf; display:block;}
+a.coursesLineGrey {padding-left:25px; color:#15bccf; display:block;}
 a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#b3e0ee;}

From 0d85fb3c5f7fb91c9edaecc7a0457f617a67cf7b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Sat, 10 Oct 2015 11:07:29 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=9C=A8=E5=8F=98=E8=89=B2=E8=8C=83=E5=9B=B4=E5=86=85?=
 =?UTF-8?q?=E9=83=BD=E5=8F=AF=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb |   8 +-
 app/views/layouts/_unlogin_header.html.erb | 190 ++++++++++-----------
 public/stylesheets/header.css              |   2 +-
 public/stylesheets/new_user.css            |   2 +-
 4 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index fbbe40a93..c750ff3b5 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -5,15 +5,15 @@
   <div class="fl">
     <ul>
       <li class="navHomepageMenu fl">
-        <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db"%>
+        <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db p10"%>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>User.current.id,:type=>1)%>" class="c_white f16 db">资源库</a></li>
+        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>User.current.id,:type=>1)%>" class="c_white f16 db p10">资源库</a></li>
       <li class="navHomepageMenu fl">
-        <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db"%>
+        <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
       </li>
       <li class="navHomepageMenu fl mr30">
-        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 db">帮助中心</a>
+        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 db p10">帮助中心</a>
       </li>
     </ul>
   </div>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index 1665a2493..e674a769f 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -1,95 +1,95 @@
-<div class="navHomepage">
-  <div class="navHomepageLogo fl">
-    <%=link_to image_tag("../images/nav_logo.png",width:"51px", height: "45px",class: "mt3"), signin_path%>
-  </div>
-  <div class="fl">
-    <ul>
-      <li class="navHomepageMenu fl mr40">
-        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16">帮助中心</a>
-      </li>
-    </ul>
-  </div>
-  <script>
-      function search(doc){
-          //alert(1)
-          // val = $('input:radio[name="search_type"]:checked').val();
-          // alert(2)
-          // $("#search_type").val(val);
-          //  alert(3)
-          $(doc).parent().submit();
-      }
-      <% type = type%>
-      $(function (){
-          if('<%= type %>' != null && '<%= type %>' == 'courses' ){
-              $('input:radio[value="courses"]').attr('checked','checked');
-          }
-          if('<%= type %>' != null && '<%= type %>' == 'projects' ){
-              $('input:radio[value="projects"]').attr('checked','checked');
-          }
-          if('<%= type %>' != null && '<%= type %>' == 'users' ){
-              $('input:radio[value="users"]').attr('checked','checked');
-          }
-      });
-
-      function search_in_header(obj){
-          var name = $.trim($('#navHomepageSearchInput').val());
-          if (name != "" &&  name.length != 0) {
-              $('#type').val($('input[type=radio]:checked').val());
-              obj.parent().submit();
-          }
-      }
-
-          function search_in_header_I(e,obj){
-              var name = $.trim($('#navHomepageSearchInput').val());
-              if (e.keyCode == '13' && name != "" &&  name.length != 0) {
-                  $('#type').val($('input[type=radio]:checked').val());
-                  obj.parent().submit();
-              }
-          }
-  </script>
-  <div class="fl" id="navHomepageSearch">
-    <!--<form class="navHomepageSearchBox">-->
-    <% name = name%>
-
-    <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
-        <input type="hidden" name="search_type" id="type" value=""/>
-        <input type="text" style="display: none;"/>
-        <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
-    <% end %>
-    <div class="navSearchTypeBox" id="navHomepageSearchType">
-      <div class="fl mr15 mt8">
-        <input type="radio" value="courses" name="search_type"  checked/>
-        课程
-      </div>
-      <div class="fl mr15 mt8">
-        <input type="radio" value="projects" name="search_type" />
-        项目
-      </div>
-      <div class="fl mr15 mt8">
-        <input type="radio" value="users" name="search_type" />
-        用户
-      </div>
-      <div id="navSearchAlert" class="fr mr10">
-        <span class="c_red">请选择搜索类型</span>
-      </div>
-    </div>
-
-  </div>
-  <div id="loginInButton" class="fr ml20">
-    <a href="<%= signin_path(:login=>true) %>" class="c_white db">登录</a>
-  </div>
-  <div id="loginSignButton" class="fr">
-    <a href="<%= signin_path(:login=>false) %>" class="c_white db">注册</a>
-  </div>
-</div>
-
-<script type="text/javascript">
-    //搜索相关
-    $("#navHomepageSearch").mouseover(function(){
-        $("#navHomepageSearchType").show();
-    }).mouseout(function(){
-        $("#navHomepageSearchType").hide();
-    });
-
-</script>
+<div class="navHomepage">
+  <div class="navHomepageLogo fl">
+    <%=link_to image_tag("../images/nav_logo.png",width:"51px", height: "45px",class: "mt3"), signin_path%>
+  </div>
+  <div class="fl">
+    <ul>
+      <li class="navHomepageMenu fl mr40">
+        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 p10">帮助中心</a>
+      </li>
+    </ul>
+  </div>
+  <script>
+      function search(doc){
+          //alert(1)
+          // val = $('input:radio[name="search_type"]:checked').val();
+          // alert(2)
+          // $("#search_type").val(val);
+          //  alert(3)
+          $(doc).parent().submit();
+      }
+      <% type = type%>
+      $(function (){
+          if('<%= type %>' != null && '<%= type %>' == 'courses' ){
+              $('input:radio[value="courses"]').attr('checked','checked');
+          }
+          if('<%= type %>' != null && '<%= type %>' == 'projects' ){
+              $('input:radio[value="projects"]').attr('checked','checked');
+          }
+          if('<%= type %>' != null && '<%= type %>' == 'users' ){
+              $('input:radio[value="users"]').attr('checked','checked');
+          }
+      });
+
+      function search_in_header(obj){
+          var name = $.trim($('#navHomepageSearchInput').val());
+          if (name != "" &&  name.length != 0) {
+              $('#type').val($('input[type=radio]:checked').val());
+              obj.parent().submit();
+          }
+      }
+
+          function search_in_header_I(e,obj){
+              var name = $.trim($('#navHomepageSearchInput').val());
+              if (e.keyCode == '13' && name != "" &&  name.length != 0) {
+                  $('#type').val($('input[type=radio]:checked').val());
+                  obj.parent().submit();
+              }
+          }
+  </script>
+  <div class="fl" id="navHomepageSearch">
+    <!--<form class="navHomepageSearchBox">-->
+    <% name = name%>
+
+    <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
+        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
+        <input type="hidden" name="search_type" id="type" value=""/>
+        <input type="text" style="display: none;"/>
+        <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
+    <% end %>
+    <div class="navSearchTypeBox" id="navHomepageSearchType">
+      <div class="fl mr15 mt8">
+        <input type="radio" value="courses" name="search_type"  checked/>
+        课程
+      </div>
+      <div class="fl mr15 mt8">
+        <input type="radio" value="projects" name="search_type" />
+        项目
+      </div>
+      <div class="fl mr15 mt8">
+        <input type="radio" value="users" name="search_type" />
+        用户
+      </div>
+      <div id="navSearchAlert" class="fr mr10">
+        <span class="c_red">请选择搜索类型</span>
+      </div>
+    </div>
+
+  </div>
+  <div id="loginInButton" class="fr ml20">
+    <a href="<%= signin_path(:login=>true) %>" class="c_white db">登录</a>
+  </div>
+  <div id="loginSignButton" class="fr">
+    <a href="<%= signin_path(:login=>false) %>" class="c_white db">注册</a>
+  </div>
+</div>
+
+<script type="text/javascript">
+    //搜索相关
+    $("#navHomepageSearch").mouseover(function(){
+        $("#navHomepageSearchType").show();
+    }).mouseout(function(){
+        $("#navHomepageSearchType").hide();
+    });
+
+</script>
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 36dcf1d81..096dd7e57 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -4,7 +4,7 @@
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
 .navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
-.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;}
+.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
 .navHomepageMenu:hover {background-color:#297fb8;}
 .navHomepageSearchBoxcontainer {margin-top:11px; }
 .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px;  margin-top:11px; background-color:#ffffff;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 4d8623fd6..5b187fa2d 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -518,7 +518,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .homepageContent {width:1000px; background-color:#eaebed; margin:0 auto;}
 .navHomepage {width:1000px; height:54px; background-color:#269ac9; margin:0 auto;}
 .navHomepageLogo {width:60px; height:54px; line-height:54px; vertical-align:middle; margin-left:2px; margin-right:30px;}
-.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle; padding:0px 10px;}
+.navHomepageMenu {margin-right:20px;display:inline-block;height:54px; line-height:54px; vertical-align:middle;}
 .navHomepageMenu:hover {background-color:#297fb8;}
 /*.navHomepageMenu:hover {background-color:#0ea6b7;}*/
 .navHomepageSearchBoxcontainer {margin-top:11px; }

From 94bffb54582ed262a83b963692dc1366adbc293f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 10 Oct 2015 11:37:58 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=A4=B4=E5=83=8F=20?=
 =?UTF-8?q?=EF=BC=8C=20=E7=B2=98=E8=B4=B4=E5=9B=BE=E7=89=87=20=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=9B=BE=E7=89=87=EF=BC=8C=E9=83=BD=E8=A6=81?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=9F=9F=E5=90=8D=E3=80=82=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=B8=AD=E5=87=BA=E7=8E=B0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controllers/kindeditor/assets_controller.rb         | 2 +-
 lib/rails_kindeditor/lib/rails_kindeditor/helper.rb         | 6 ++++--
 public/assets/kindeditor/kindeditor.js                      | 6 +++++-
 public/assets/kindeditor/plugins/emoticons/emoticons.js     | 3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb
index 0e1177563..d7d5948d4 100644
--- a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb
+++ b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb
@@ -13,7 +13,7 @@ class Kindeditor::AssetsController < ApplicationController
           logger.warn '========= Warning: the owner_id is 0, "delete uploaded files automatically" will not work. =========' if defined?(logger) && @asset.owner_id == 0
           @asset.asset_type = @dir
           if @asset.save
-            render :text => ({:error => 0, :url => @asset.asset.url,:asset_id => @asset.id}.to_json)
+            render :text => ({:error => 0, :url => "http://"+Setting.host_name + "/" + @asset.asset.url,:asset_id => @asset.id}.to_json)
           else
             show_error(@asset.errors.full_messages)
           end
diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
index f30ee2236..eef2eb576 100644
--- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
+++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
@@ -9,7 +9,8 @@ module RailsKindeditor
       output << text_area_tag(name, content, input_html)
       output << javascript_tag(js_replace(id, options.merge(window_onload: 'true',
                                                             :autoHeightMode=>true,
-                                                            afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})'
+                                                            afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})',
+                                                            emotionsBasePath: 'http://' + Setting.host_name
                                                             )))
     end
     
@@ -21,7 +22,8 @@ module RailsKindeditor
       output_buffer << build_text_area_tag(name, method, self, options, input_html)
       output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true',
                                                                                  :autoHeightMode=>true,
-                                                                                afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})'
+                                                                                afterCreate: 'eval(function(){enablePasteImg(self);this.loadPlugin("autoheight")})',
+                                                                                emotionsBasePath: 'http://' + Setting.host_name
                                                                                 )))
     end
     
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 448585376..da7434d9b 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -243,6 +243,7 @@ K.options = {
 	shadowMode : true,
 	loadStyleMode : true,
 	basePath : K.basePath,
+    emotionsBasePath: 'http://forge.trustie.net', //TODO
 	themesPath : K.basePath + 'themes/',
 	langPath : K.basePath + 'lang/',
 	pluginsPath : K.basePath + 'plugins/',
@@ -5459,6 +5460,7 @@ function _editor(options) {
 _instances = [];
 function _create(expr, options) {
 	options = options || {};
+    options.emotionsBasePath = _undef(options.emotionsBasePath,'http://forge.trustie.net') // TODO
 	options.basePath = _undef(options.basePath, K.basePath);
 	options.themesPath = _undef(options.themesPath, options.basePath + 'themes/');
 	options.langPath = _undef(options.langPath, options.basePath + 'lang/');
@@ -5623,7 +5625,9 @@ _plugin('core', function(K) {
         url:K.addParam('/kindeditor/upload', 'dir=image'),
         afterUpload : function(data) {
             if (data.error === 0) {
-                var url = K.formatUrl(data.url, 'absolute');
+
+               var url = data.url//K.formatUrl(data.url, 'absolute');
+               // console.log(url)
                 self.exec('insertimage', url, 'image','','','1','');
 				//self.exec('insertimage', url, 'image','','','1','left');
                 //self.insertHtml('<img src="'+url+'"/>');
diff --git a/public/assets/kindeditor/plugins/emoticons/emoticons.js b/public/assets/kindeditor/plugins/emoticons/emoticons.js
index b9dfec431..7884f53fb 100644
--- a/public/assets/kindeditor/plugins/emoticons/emoticons.js
+++ b/public/assets/kindeditor/plugins/emoticons/emoticons.js
@@ -9,7 +9,8 @@
 
 KindEditor.plugin('emoticons', function(K) {
 	var self = this, name = 'emoticons',
-		path = (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
+
+		path = self.emotionsBasePath + (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
 		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
 		currentPageNum = 1;
 	self.clickToolbar(name, function() {