From 62399b6d72f48754d40b86c38db8471d48509f4c Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 30 Nov 2015 11:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=AF=BE=E7=A8=8B=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=E6=B7=BB=E5=8A=A0=20=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/_search_all_results.html.erb        | 11 +++++++++--
 app/views/welcome/_search_attachment_results.html.erb |  6 +++++-
 app/views/welcome/_search_course_results.html.erb     |  6 +++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/views/welcome/_search_all_results.html.erb b/app/views/welcome/_search_all_results.html.erb
index 98dc39ba7..014c6b487 100644
--- a/app/views/welcome/_search_all_results.html.erb
+++ b/app/views/welcome/_search_all_results.html.erb
@@ -28,7 +28,11 @@
               </li>
               <li class="fl searchContentDes">
                 <ul class="fl">
-                  <li class="f16 mb5"><a href="<%= course_path(item.id)%>" class="fontGrey3"><%= item.try(:highlight).try(:name) ? item.highlight.name[0].html_safe : item.name  %></a></li>
+                  <li class="f16 mb5">
+                    <a href="<%= course_path(item.id)%>" class="fontGrey3 fl"><%= item.try(:highlight).try(:name) ? item.highlight.name[0].html_safe : item.name  %></a>
+                    <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">课程</span></div>
+                    <div class="cl"></div>
+                  </li>
                   <li class="fontGrey3 mb5"><%= item.try(:highlight).try(:description) ? item.highlight.description[0].html_safe : item.description %></li>
                   <li class="f12 fontGrey2"><span class="mr30">教师：<%= User.find(item.tea_id).realname %></span><span class="mr30">授课时间：<%= item.time.to_s + item.term%></span><span class="mr30"><%= User.find(item.tea_id).user_extensions.occupation.present? ? '单位：'+User.find(item.tea_id).user_extensions.occupation : ''%></span></li>
                 </ul>
@@ -41,7 +45,10 @@
               </li>
               <li class="fl searchContentDes">
                 <ul class="fl">
-                  <li class="f16 mb5 fontGrey3"><a href="<%= download_named_attachment_path(item.id,item.filename)%>" class="fontGrey3 mr10"><%= item.try(:highlight).try(:filename) ? item.highlight.filename[0].html_safe : item.filename %></a><span class="f12">(<%=  number_to_human_size(item.filesize)%>)</span></li>
+                  <li class="f16 mb5 fontGrey3"><a href="<%= download_named_attachment_path(item.id,item.filename)%>" class="fontGrey3 mr10 fl"><%= item.try(:highlight).try(:filename) ? item.highlight.filename[0].html_safe : item.filename %></a><span class="f12 fl" style="padding-top: 5px">(<%=  number_to_human_size(item.filesize)%>)</span>
+                    <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">资源</span></div>
+                    <div class="cl"></div>
+                  </li>
                   <li class="f12 fontGrey2"><span class="mr30">发布者：<%= User.find(item.author_id).login%>（<%= User.find(item.author_id).realname%>）</span>
                     <!--<span class="mr30">职称：<%#= get_technical_title User.find(item.author_id) %></span>-->
                     <span class="mr30">发布时间：<%= format_date(item.created_on)%></span></li>
diff --git a/app/views/welcome/_search_attachment_results.html.erb b/app/views/welcome/_search_attachment_results.html.erb
index 677dfa2d2..36c4fcbab 100644
--- a/app/views/welcome/_search_attachment_results.html.erb
+++ b/app/views/welcome/_search_attachment_results.html.erb
@@ -5,7 +5,11 @@
           </li>
           <li class="fl searchContentDes">
             <ul class="fl">
-              <li class="f16 mb5 fontGrey3"><a href="<%= download_named_attachment_path(attachment.id,attachment.filename)%>" class="fontGrey3 mr10"><%= attachment.try(:highlight).try(:filename) ? attachment.highlight.filename[0].html_safe : attachment.filename %></a><span class="f12">(<%=  number_to_human_size(attachment.filesize)%>)</span></li>
+              <li class="f16 mb5 fontGrey3">
+                <a href="<%= download_named_attachment_path(attachment.id,attachment.filename)%>" class="fontGrey3 mr10 fl"><%= attachment.try(:highlight).try(:filename) ? attachment.highlight.filename[0].html_safe : attachment.filename %></a><span class="f12 fl" style="padding-top: 5px">(<%=  number_to_human_size(attachment.filesize)%>)</span>
+                <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">资源</span></div>
+                <div class="cl"></div>
+              </li>
               <li class="f12 fontGrey2"><span class="mr30">发布者：<%= User.find(attachment.author_id).login%>（<%= User.find(attachment.author_id).realname%>）</span>
                 <!--<span class="mr30">职称：<%#= get_technical_title User.find(attachment.author_id) %></span>-->
                 <span class="mr30">发布时间：<%= format_date(attachment.created_on)%></span></li>
diff --git a/app/views/welcome/_search_course_results.html.erb b/app/views/welcome/_search_course_results.html.erb
index b563ea372..89567063d 100644
--- a/app/views/welcome/_search_course_results.html.erb
+++ b/app/views/welcome/_search_course_results.html.erb
@@ -6,7 +6,11 @@
           </li>
           <li class="fl searchContentDes">
             <ul class="fl">
-              <li class="f16 mb5"><a href="<%= course_path(course.id)%>" class="fontGrey3"><%= course.try(:highlight).try(:name) ? course.highlight.name[0].html_safe : course.name  %></a></li>
+              <li class="f16 mb5">
+                <a href="<%= course_path(course.id)%>" class="fontGrey3 fl"><%= course.try(:highlight).try(:name) ? course.highlight.name[0].html_safe : course.name  %></a>
+                <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">课程</span></div>
+                <div class="cl"></div>
+              </li>
               <li class="fontGrey3 mb5"><%= course.try(:highlight).try(:description) ? course.highlight.description[0].html_safe : (course.description.present? ? course.description : '暂时没有该课程描述') %></li>
               <li class="f12 fontGrey2"><span class="mr30">教师：<%= User.find(course.tea_id).realname %></span><span class="mr30">授课时间：<%= course.time.to_s + course.term%></span><span class="mr30"><%= User.find(course.tea_id).user_extensions.occupation.present? ? '单位：'+User.find(course.tea_id).user_extensions.occupation : ''%></span></li>
             </ul>