From 2b5928602ed38a163c6d91e669cd083e52972124 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 23 Jan 2015 09:17:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=94=B1=E4=BA=8E=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=82=AC=E6=B5=AE=E6=A1=86=E5=BC=95=E8=B5=B7=E7=9A=84?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84padding=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E6=94=B9=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E8=B0=83=E6=9F=A5=E5=B7=A6=E4=BE=A7=E4=BC=9A=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E6=BB=9A=E5=8A=A8=E6=9D=A1=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/views/bids/_bid_homework_show.html.erb |  11 ++-
 app/views/layouts/_base_feedback.html.erb  | 102 ++++++++++-----------
 app/views/poll/_poll_form.html.erb         |   2 +-
 public/stylesheets/polls.css               |   6 +-
 4 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index 2d6c35555..49325c0d4 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -56,18 +56,21 @@
                   <%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %>
                 </span>
               </td>
-              <td style="width: 110px;">
+              <td style="width: 120px;">
                 <span style="float: right">
                   <% if User.current.logged? && is_cur_course_student(@course) %>
                      <% cur_user_homework = cur_user_homework_for_bid(bid) %>
+                      <span class="span_wping">
+                           <a>匿评中..</a>
+                     </span>
                       <% if cur_user_homework && cur_user_homework.empty? %>
                          <span class="span_wping">
                            <%= link_to l(:label_commit_homework),new_exercise_book_path(bid)  %>
                          </span>
                       <% else %>
-                          <span style="color: green; float: right">
-                            <%= l(:lable_has_commit_homework)%>
-                          </span>
+                          <span class="span_wping">
+                           <a>已&nbsp;提&nbsp;交</a>
+                         </span>
                       <% end %>
                   <% end %>
                   <% if (User.current.admin?||User.current.allowed_to?(:as_teacher,@course)) %>
diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index ae85d9479..23a610c14 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -1,10 +1,10 @@
 <style type="text/css">
-	body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
-div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ }
-div,img,tr,td,table{ border:0;}
-ol,ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
-a{ text-decoration:none;}
+	#scrollsidebar{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+    #scrollsidebar div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ }
+    #scrollsidebar div,img,tr,td,table{ border:0;}
+    #scrollsidebar ol,ul,li{ list-style-type:none}
+    #scrollsidebar .cl{ clear:both; overflow:hidden; }
+    #scrollsidebar a{ text-decoration:none;}
 
 html{ overflow-x:hidden;}
 .custom_service p img {display: inline; margin-top:-5px; vertical-align:middle;}
@@ -42,19 +42,19 @@ a:hover.opnionButton{ text-decoration:underline;}
 	/* =================================================
 //
 // jQuery Fixed Plugins 1.3.1
-// author : 
-// Url: 
+// author :
+// Url:
 // Data : 2012-03-30
 //
-// ���� : float --> ����[left or right]
-//		  minStatue --> ��С״̬��ֻ��show_btn
-//		  skin      --> Ƥ������
-//		  durationTime --> ���ʱ��
-//����  :	
+// ???? : float --> ????[left or right]
+//		  minStatue --> ??С???????show_btn
+//		  skin      --> ???????
+//		  durationTime --> ??????
+//????  :
 		  $("#scrollsidebar2").fix({
-		  	float : 'right',	//default.left or right 
-			minStatue : true,	//default.false or true 
-			skin : 'green',		//default.gray or yellow ��blue ��green ��orange ��white 
+		  	float : 'right',	//default.left or right
+			minStatue : true,	//default.false or true
+			skin : 'green',		//default.gray or yellow ??blue ??green ??orange ??white
 		  	durationTime : 1000 //
 		  });
 //
@@ -66,53 +66,53 @@ a:hover.opnionButton{ text-decoration:underline;}
             float : 'left',
 			minStatue : false,
 			skin : 'blue',
-			durationTime : 1000	
+			durationTime : 1000
         }
-        var options = $.extend(defaults, options);		
+        var options = $.extend(defaults, options);
 
-        this.each(function(){			
-            //��ȡ����
+        this.each(function(){
+            //???????
 			var thisBox = $(this),
 				closeBtn = thisBox.find('.close_btn' ),
 				show_btn = thisBox.find('.show_btn' ),
 				sideContent = thisBox.find('.side_content'),
 				sideList = thisBox.find('.side_list')
-				;	
-			var defaultTop = thisBox.offset().top;	//�����Ĭ��top	
-			
-			thisBox.css(options.float, 0);			
+				;
+			var defaultTop = thisBox.offset().top;	//????????top
+
+			thisBox.css(options.float, 0);
 			if(options.minStatue){
 				$(".show_btn").css("float", options.float);
 				sideContent.css('width', 0);
 				show_btn.css('width', 25);
-				
+
 			}
-			//Ƥ������
+			//???????
 			if(options.skin) thisBox.addClass('side_'+options.skin);
-				
-						
-			//����scroll�¼�			
+
+
+			//????scroll???
 			$(window).bind("scroll",function(){
 				var offsetTop = defaultTop + $(window).scrollTop() + "px";
 	            thisBox.animate({
 	                top: offsetTop
 	            },
 	            {
-	                duration: options.durationTime,	
-	                queue: false    //�˶����������붯������
+	                duration: options.durationTime,
+	                queue: false    //???????????????????
 	            });
-			});	
-			//close�¼�
+			});
+			//close???
 			closeBtn.bind("click",function(){
 				sideContent.animate({width: '0px'},"fast");
             	show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
 			});
-			//show�¼�
+			//show???
 			 show_btn.click(function() {
 	            $(this).animate({width: '0px'},"fast");
 	            sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast");
 	        });
-				
+
         });	//end this.each
 
     };
@@ -132,36 +132,34 @@ function f_submit()
 }
 </script>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
 <title>意见反馈</title>
-<link href="css/sidebar.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="js/jquery-1.8.0.min.js"></script>
-<script type="text/javascript" src="js/sidebar.js"></script>
+
 </head>
 <body style="height:auto">
-<!-- ´úÂë ¿ªÊ¼ -->
+<!-- ?ú?? ???? -->
 <div class="scrollsidebar" id="scrollsidebar">
     <div class="side_content">
         <div class="side_list">
             <div class="side_title"><a title="意见反馈" class="close_btn"><span><%= l(:label_feedback) %></span></a></div>
-            <div class="side_center">            	
-                <div class="custom_service">                  
+            <div class="side_center">
+                <div class="custom_service">
                   <% get_memo %>
 				  <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-         		    <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>        
+         		    <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
           			<%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
 		  			 <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
-          			<a href="javascript:void(0);" class="opnionButton" id="" onclick="f_submit();">提&nbsp;&nbsp;交</a>          			
-				  <% end %>   			   			                
-                </div>                               
+          			<a href="javascript:void(0);" class="opnionButton" id="" onclick="f_submit();">提&nbsp;&nbsp;交</a>
+				  <% end %>
+                </div>
                 <div class="msgserver">
-                    <p>                    	                                    	
+                    <p>
                    	<a href="http://user.trustie.net/users/12/user_newfeedback"><%= l(:label_technical_support) %>黄井泉</a></br>
                     <a href="http://user.trustie.net/users/34/user_newfeedback"><%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
-                    </p>                    
+                    </p>
                 </div>
             </div>
             <div class="side_bottom"></div>
@@ -169,9 +167,9 @@ function f_submit()
     </div>
     <div class="show_btn"><span>提交</span></div>
 </div>
-<!-- ´úÂë ½áÊø -->
-<script type="text/javascript"> 
-$(function() { 
+<!-- ?ú?? ?á?? -->
+<script type="text/javascript">
+$(function() {
 	$("#scrollsidebar").fix({
 		float : 'right',	//default.left or right
 		//minStatue : true,
@@ -179,7 +177,7 @@ $(function() {
 		durationTime : 600
 	});
 });
-</script> 
+</script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index b3fae8b4a..df4859613 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -59,7 +59,7 @@
       {
           $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
           showModal('ajax-modal', '310px');
-          $('#ajax-modal').css('height','110px');
+          $('#ajax-modal').css('height','115px');
           $('#ajax-modal').siblings().remove();
           $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
                   "<a href='#' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index e601d231d..863ee5864 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -14,9 +14,9 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 #polls .fr{ float:right;}
 
 /*问卷按钮*/
-.polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; padding:7px 0 0 15px; }
-.polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
-.polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}
+/*.polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; padding:7px 0 0 15px; }*/
+/*.polls_btn a{font-size:14px; color:#444444;font-weight:bold;}*/
+/*.polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}*/
 
 /*问卷列表*/
 .polls_content{ width:615px;padding-left: 6px;}