From 6a10e19f63cce54cbdd9c54f28c16cbaa3a47f3d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 31 Oct 2014 17:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=95=99=E8=A8=80=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homework_attach/_homeworks_list.html.erb  | 14 +++--
 app/views/homework_attach/_show.html.erb      | 54 +++++++++++++++----
 public/stylesheets/css.css                    |  6 +++
 3 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/app/views/homework_attach/_homeworks_list.html.erb b/app/views/homework_attach/_homeworks_list.html.erb
index 4d456c3ae..f7e2bee59 100644
--- a/app/views/homework_attach/_homeworks_list.html.erb
+++ b/app/views/homework_attach/_homeworks_list.html.erb
@@ -19,14 +19,12 @@
     <% homeworks.each do |homework| %>
         <ul>
           <li class="pic_head">
-            <a href="#" target="_blank">
-              <%= link_to image_tag(url_to_avatar(homework.user), :width => "40", :height => "40"), user_path(homework.user) %>
-              <span>
-                <% user_realname = homework.user.lastname.to_s + homework.user.firstname.to_s %>
-                <% user_name = is_teacher ? (user_realname.empty? ? homework.user.login : user_realname)  : homework.user.login %>
-                <%= link_to user_name, user_path(homework.user), :title => user_name %>
-              </span>
-            </a>
+            <%= link_to image_tag(url_to_avatar(homework.user), :width => "40", :height => "40"), user_path(homework.user) %>
+            <span>
+              <% user_realname = homework.user.lastname.to_s + homework.user.firstname.to_s %>
+              <% user_name = is_teacher ? (user_realname.empty? ? homework.user.login : user_realname)  : homework.user.login %>
+              <%= link_to user_name, user_path(homework.user), :title => user_name %>
+            </span>
           </li>
           <li class="wname">
             <% if homework.name == nil || homework.name == "" %>
diff --git a/app/views/homework_attach/_show.html.erb b/app/views/homework_attach/_show.html.erb
index 3c2840dbc..9811cf228 100644
--- a/app/views/homework_attach/_show.html.erb
+++ b/app/views/homework_attach/_show.html.erb
@@ -3,14 +3,19 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>作业评分弹框</title>
+  <link href="css.css" rel="stylesheet" type="text/css" />
   <script type="text/javascript" language="javascript">
       //<!CDATA[
       function g(o){return document.getElementById(o);}
       function HoverLi(n){
+//如果有N个标签,就将i<=N;
           for(var i=6;i<=7;i++){g('ping_tb_'+i).className='ping_normaltab';g('tbc_0'+i).className='ping_undis';}g('tbc_0'+n).className='ping_dis';g('ping_tb_'+n).className='ping_hovertab';
       }
+      //如果要做成点击后再转到请将<li>中的onmouseover 改成 onclick;
+      //]]>
   </script>
-  <%= stylesheet_link_tag  'css', :media => 'all' %>
+
+
 </head>
 
 <body>
@@ -18,7 +23,7 @@
   <!--<div class="alert" style="position: fixed;">-->
     <!--<div>-->
 
-      <!--<span class="close" style="display: block;" onclick="hideModal(this)"></span>-->
+      <!--<span class="close" style="display: block;" onclick="pupclose()"></span>-->
     <!--</div>-->
   <!--</div> &lt;!&ndash;-- alert end--&ndash;&gt;-->
   <div class="ping_con">
@@ -43,22 +48,26 @@
     <textarea id="ta_msg_content" name="content" placeholder="最多250个字"  ></textarea>
     <a href="#" class="ping_sub">提交评论</a>
     <div class="cl"></div>
-  </div>
+  </div><!---ping_con end--->
 
   <div class="ping_list">
     <div id="ping_tb_" class="ping_tb_">
       <ul>
-        <li id="ping_tb_6" class="ping_hovertab" onmouseover="x:HoverLi(6);">
-          全部评论（100）</li>
-        <li id="ping_tb_7" class="ping_normaltab" onmouseover="i:HoverLi(7);">
-          教师评论</li>
+        <li id="ping_tb_6" class="ping_hovertab" onmouseover="x:HoverLi(1);">
+          全部评论（<span class="c_red">30</span>）</li>
+        <li id="ping_tb_7" class="ping_normaltab" onmouseover="i:HoverLi(2);">
+          教师评论（<span class="c_red">30</span>）</li>
       </ul>
     </div>
     <div class="cl"></div>
     <div class="ping_ctt">
       <div class="ping_dis" id="tbc_06">
         <div class="ping_C">
-          <div class="ping_dispic"><a href="#" target="_blank"><img src="images/225905790.jpg" width="46" height="46" /></a></div>
+          <div class="ping_dispic">
+            <a href="#" target="_blank">
+              <%= image_tag(url_to_avatar(User.current), :width => "46", :height => "46")  %>
+            </a>
+          </div>
           <div class="ping_discon">
             <div class="ping_distop">
               <span><a href="#" target="_blank" style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" >gugu01</a></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;" >2014-10-24</span><span style="font-weight:bold; color:#a6a6a6; " >评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
@@ -71,7 +80,7 @@
           <div class="cl"></div>
         </div>
         <div class="ping_C">
-          <div class="ping_dispic"><a href="#" target="_blank"><img src="images/225905790.jpg" width="46" height="46" /></a></div>
+          <div class="ping_dispic"><a href="#" target="_blank"><%= image_tag(url_to_avatar(User.current), :width => "46", :height => "46")  %></a></div>
           <div class="ping_discon">
             <div class="ping_distop">
               <span><a href="#" target="_blank" style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" >gugu01</a></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;" >2014-10-24</span><span style="font-weight:bold; color:#a6a6a6; " >评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
@@ -79,13 +88,34 @@
               <p>我写了一个验证身份证号码的程序，它是以一定内存空间（大概100M)换取cpu消耗，然后它的运算量就降低了，前十四位的验证就相当于转换类型再查表一样，所以它的验证号码速度比一般的方式快。如果还不明白就说明你写框架写多了，或者</p>
             </div>
             <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
+            <div class="cl"></div>
+            <div class="recall">
+              <div class="recall_head"><a href="#" target="_blank"><%= image_tag(url_to_avatar(User.current), :width => "30", :height => "30")  %></a></div>
+              <div class="recall_con">
+                <a href="#">jack</a>&nbsp;回复&nbsp;<a href="#">jack</a>:
+                <p>我们尽快修复，此问题已发现原因，测试后我们尽快上线。谢谢反馈！！</p>
+                <span style="float:left; color:#a6a6a6;">2014-10-31</span>
+                <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
+              </div>
+              <div class="cl"></div>
+            </div>
+            <div class="recall">
+              <div class="recall_head"><a href="#" target="_blank"><%= image_tag(url_to_avatar(User.current), :width => "30", :height => "30")  %></a></div>
+              <div class="recall_con">
+                <a href="#">jack</a>&nbsp;回复&nbsp;<a href="#">jack</a>:
+                <p>我们尽快修复，此问题已发现原因，测试后我们尽快上线。谢谢反馈！！</p>
+                <span style="float:left; color:#a6a6a6;">2014-10-31</span>
+                <div class="ping_disfoot"><a href="#">删除</a><a href="#">回复</a></div>
+              </div>
+              <div class="cl"></div>
+            </div>
 
 
           </div>
           <div class="cl"></div>
         </div>
         <div class="ping_C">
-          <div class="ping_dispic"><a href="#" target="_blank"><img src="images/225905790.jpg" width="46" height="46" /></a></div>
+          <div class="ping_dispic"><a href="#" target="_blank"><%= image_tag(url_to_avatar(User.current), :width => "46", :height => "46")  %></a></div>
           <div class="ping_discon">
             <div class="ping_distop">
               <span><a href="#" target="_blank" style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" >gugu01</a></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;" >2014-10-24</span><span style="font-weight:bold; color:#a6a6a6; " >评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
@@ -103,7 +133,7 @@
 
       <div class="ping_undis" id="tbc_07">
         <div class="ping_C">
-          <div class="ping_dispic"><a href="#" target="_blank"><img src="images/225905790.jpg" width="46" height="46" /></a></div>
+          <div class="ping_dispic"><a href="#" target="_blank"><%= image_tag(url_to_avatar(User.current), :width => "46", :height => "46")  %></a></div>
           <div class="ping_discon">
             <div class="ping_distop">
               <span><a href="#" target="_blank" style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" >gugu01</a></span><span style="color:#a6a6a6; margin-right:40px; margin-left:30px;" >2014-10-24</span><span style="font-weight:bold; color:#a6a6a6; " >评分:<a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span>
@@ -124,5 +154,7 @@
   </div>
 
 </div><!---ping_list end--->
+
+</div>
 </body>
 </html>
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index ff2c60886..3e0b673ed 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -84,6 +84,12 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 .ping_con textarea{ width:455px; height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;}
 a.ping_sub{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;}
 a:hover.ping_sub{ background:#14a8b9;}
+.recall{ border-top:1px solid #CCC; padding:5px 0;}
+.recall_head{ float:left;}
+.recall_head a{ display:block; width:30px; height:30px; border:1px solid #CCC; padding:1px;}
+.recall_head a:hover{border:1px solid #15bccf;}
+.recall_con{ float:left;color:#777777; width:335px; margin-left:10px; }
+.recall_con a{ color:#15bccf; }
 
 .ping_list{ margin-top:15px;}
 
