From 9c192f5a9229094075567536b0f82934e67418d5 Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Wed, 4 Dec 2013 15:49:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E7=95=8C=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/index.html.erb | 62 +++++++++++++++++---------------
 public/stylesheets/welcome.css   | 35 ++++++++++++------
 2 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 1dd7d4e6d..bb037cbfc 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -94,30 +94,36 @@
 		}
 	}
 	
-	 // $(function(){
-		// var x = 10;
-		// var y = 20;
-		// $("span.tooltip").mouseover(function(e){
-			// this.myTitle = this.title;
-			// this.title = "";
-			// var tooltip = "<div id='tooltip' style='background-color: red;'>" + this.myTitle + "</div>";
-			// $("body").append(tooltip);
-			// $("#tooltip")
-			  // .css({
-				// "top": (e.pageY + y) + "px",
-				// "left": (e.pageX + x) + "px"
-			// }).show("fast");
-		// }).mouseout(function(){
-			// this.title = this.myTitle;
-			// $("#tooltip").remove();
-		// }).mousemove(function(e){
-			// $("#tooltip")
-			  // .css({
-				// "top": (e.pageY + y) + "px",
-				// "left": (e.pageX + x) + "px"
-			// });
-		// });
-	// })
+	 $(function(){
+		var x = 10;
+		var y = 20;
+		$("span.tooltip").mouseover(function(e){
+			this.myTitle = this.title;
+			this.title = "";
+			var tooltip = "<div id='tooltip' style='background-color: red; position: absolute;'>" + this.myTitle + "</div>";
+			$("body").append(tooltip);
+			$("#tooltip")
+			  .css({
+				"top": (e.pageY + y) + "px",
+				"left": (e.pageX + x) + "px"
+			}).show("fast");
+		}).mouseout(function(){
+			this.title = this.myTitle;
+			$("#tooltip").remove();
+		}).mousemove(function(e){
+			$("#tooltip")
+			  .css({
+				"top": (e.pageY + y) + "px",
+				"left": (e.pageX + x) + "px"
+			});
+		});
+	})
+	
+	// $('li').mouseover(function(){ 
+      // var id=$(this).attr('id'); 
+      // alert(id); 
+    // }); 
+
 
 </script>
 <!-- info display block -->
@@ -126,16 +132,16 @@
 	
 <div class="left" style="float: left; height: 445px; width: 50%;">  
 <ul class="welcome-message-list" style="width: 90%; ">
-	<h3 style="">论坛热帖</h3>
+	<h3 style="color: rgb(21, 188, 207)"><strong>论坛热帖</strong></h3>
 	<div class="welcome-box-list">
 		<% find_hot_forum_topics.each do |topic|%>
 		<li class="message-brief-intro" style="min-height: 25px;">
 			<div  style="display: inline-block;">
 			  <span style="color:gray; display: inline-block;   background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<%= link_to topic.subject.truncate(25, omission: '...'), forum_memo_path(topic.forum_id,topic.id), :class => "gray" %></span> 
 			<span style="margin-left: 20px; color: green !important; white-space: nowrap;">
-				<%= link_to topic.author, user_path(topic.author), :style => "color: green;"%>
+				<%= link_to topic.author, user_path(topic.author), :style => "color: rgb(72,72,72);"%>
 			</span>
-			<span style="margin-left:20px; color:blue; white-space: nowrap;"><%= time_tag_welcome topic.created_at %>前</span>
+			<span style="margin-left:20px; color:rgb(72,72,72); white-space: nowrap;"><%= time_tag_welcome topic.created_at %>前</span>
 			</div>
 		</li>
 		<% end %>
@@ -145,7 +151,7 @@
 
 <div class="right" style="float: right; margin-right: -10px; height: 445px; width: 50%; ">	
 	<ul class="user-welcome-message-list" style="width: 80%; margin-top: 0px;">
-		<h3 style="margin-left: -5px;">用户动态</h3>
+		<h3 style="margin-left: -5px; color: rgb(21, 188, 207)"><strong>用户动态</strong></h3>
 		<div class="user-message-box-list">
 		<% find_all_activities.each do |event| %>
 		<li style="display: block;height:60px;">
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index bc2e1b7ce..7d85e3615 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -91,7 +91,7 @@ ul.welcome-message-list{
 }
 /*鍚勭鍒楄〃鏄剧ず*/
 .d-p-index-box{
-    border: 1px solid #e6e6e6;
+    /*border: 1px solid #e6e6e6;*/
     background: #ffffff;
     padding: 1px;
 }
@@ -105,19 +105,25 @@ ul.welcome-message-list{
 .d-p-index-box h2{
     height: 35px;
     line-height: 35px;
-    background-color: #f2f2f2;
-    color: #333;
+    background-color: rgb(252, 252, 252);
+    color: green;
     text-indent: 8px;
     margin: 0;
     padding: 0;
     display: block;
     font-size: 1em;
-    -webkit-margin-before: 0.83em;
+    border-top: none;
+    border-bottom: 1px solid rgb(21, 165, 200);
+    /*-webkit-margin-before: 0.83em;
     -webkit-margin-after: 0.83em;
     -webkit-margin-start: 0px;
-    -webkit-margin-end: 0px;
+    -webkit-margin-end: 0px;*/
     font-weight: bold;
     margin-top: 0px;
+    /*-webkit-box-shadow:5px 2px 6px #eee;
+    -moz-box-shadow:5px 2px 6px #eee;
+    padding:4px 10px;
+    text-shadow:5px 2px 6px #eee;*/
 }
 .d-p-index-hotproject{
     width: 48%;
@@ -150,15 +156,16 @@ li {
     height:auto;
     margin: 0px;
     padding: 0px;
+    background-color: rgb(252, 252, 252);
 }
 .d-p-index-newsource li,.d-p-index-hotproject ul.d-p-projectlist li{
-    color: #999999;
+    color: rgb(72,72,72);
     background: center -1px no-repeat;
     line-height: 20px;
     padding: 5px 5px 0px 9px;
     width: 440px;
     /*cursor: pointer;*/
-    font: 12px/1.5 tahoma,arial,\5b8b\4f53;
+    /*font: 12px/1.5 tahoma,arial,\5b8b\4f53;*/
     float: left;
 /*    display:block;*/
     margin-left: 0px;
@@ -167,7 +174,7 @@ li {
 }
 
 .d-g-blue{
-    color: green !important;
+    color: rgb(62, 98, 166) !important;
     font-weight: 700;
 
 }
@@ -196,8 +203,12 @@ p.layout {
 	height: 40px; 
 	margin-top: 5px;
 }
-.message-brief-intro .gray{
-	color: gray;
+.message-brief-intro a.gray{
+	color: #07a;
+}
+
+.message-brief-intro a.gray:visited{
+	color: blue;
 }
 
 .avatar-4 {
@@ -210,7 +221,9 @@ p.layout {
 /*p.clr, .clr { clear:both; padding:0; margin:0; background:none;}*/
 
 
-
+.inner-right a, a:link, a:visited {
+	color: rgb(62, 98, 166);
+}