.

app/views/welcome/index.html.erb

@@ -5,9 +5,6 @@
 			<tr>
 				<td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span></td>
 			</tr>
-			<!-- <tr>
-				<td class="font_welcome_Edescription">Trustie forge,a socialized collaboration platform for project management,software development and software crowdsourcing for creative university students and entrepreneurs.</td>
-			</tr> -->
 		</table>
 	</div>
 	<table>
@@ -34,12 +31,17 @@
 							<% end %>
 							<tr>
 								<td></td>
-						<td align="left"> <% if Setting.autologin? %> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label> <% end %> </td>
+								<td align="left">
+									<% if Setting.autologin? %> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
+									<% end %>
+								</td>
 							</tr>
 							<tr>
-						<td align="left"> <% if Setting.lost_password? %>
+								<td align="left">
+									<% if Setting.lost_password? %>
 										<%= link_to l(:label_password_lost), lost_password_path %>
-						<% end %> </td>
+									<% end %>
+								</td>
 								<td align="right">
 									<input type="submit" name="login" value="<%= l(:button_login)%> &#187;" tabindex="5"/>
 								</td>
@@ -48,8 +50,6 @@
 					<% else %>
 						<div>
 						<!--info-->
- 
-<!-- modified by bai -->
 						<table width="200" border="0">
 						  <tr>
 						    <td colspan="2" align="center" class="font_welcome_Cdescription" ><%= l(:label_welcome) %> <strong class="font_small_watch" style=" word-wrap: break-word; word-break: break-all"><%=link_to User.current.lastname<<User.current.firstname, user_path(User.current) %></strong> <%= l(:label_join) %></td>
@@ -67,11 +67,11 @@
 								</td>
 						  </tr>
 						</table>
-<!-- end -->
 						</div>
 					<% end %>
 				<% end %>
-			</div> <%= call_hook :view_account_login_bottom %>
+			</div>
+			<%= call_hook :view_account_login_bottom %>
 
 			<% if params[:username].present? %>
 			<%= javascript_tag "$('#password').focus();" %>
@@ -100,24 +100,66 @@
 		}
 	}
 </script>
+<%= stylesheet_link_tag 'welcome' %>
+<div class="body_resize">
+  <div class="right">
+      <div class="home">热门项目</div>
+        <div class="project"> 
+            <span style="overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;">
+                <a href="#"  >Trustie1balabalbalabalbalabalbalabalbalabalbalabalbbalabalbalabalbalabalbalabalbalabalbalabal</a> 
+            </span>
+            <span class="grey">This is a project!balabalabalabala...</span></div>
                 
+        </div>
+      <!-- p class="grey">Fusce vehicula dignissim ligula. Vestibulum sit amet neque eu neque suscipit consequat quis vel risus. </p>
+      <p><strong>Vestibulum vehicula purus nec dui accumsan fermentum.</strong> Suspendisse potenti. Ut dapibus est id odio pretium blandit in eget leo. Aliquam erat volutpat. Curabitur blandit </p>
 
+      <p class="grey">&nbsp;</p -->
+      
+  </div>
+  <div class="left">
+    <div class="home" >新手指引 &amp; 问答</div>
+      
+    <!-- p><strong><em> 5th / April / 2009 </em></strong></p>
+    <p>Integer mauris. Cras iaculis viverra dolorqw. Nulla suscipit. </p -->
+    <div class="project"> <a href="#" ><span >新手入门指引帖 && FAQ bala...</span></a> <span class="grey"><strong><em>[ Trustie ]</em></strong></span></div>
+    
+  </div>
+  <div class="clr"></div>
+</div>
+<!-- end -->
+
+<br/><br/><br/><br/><br/><br/><br/>
 
 <!-- end -->
 
 
 <div>
 	<table width="700" border="0" align="center" style="padding-top: 0px">
-		<tr><td colspan="5" align="center" style="padding-bottom: 10px; font-size: 18px; font-color: #5c5c5c ; font-family: 微软雅黑"><%= l(:label_welcome_leave_message) %> <strong><%= toggle_link l(:label_welcome_click_me), 'put-bid-form', {:focus => 'new_form_project_message'} %></strong></td></tr>
+		<tr>
+			<td colspan="5" align="center" style="padding-bottom: 10px; font-size: 18px; font-color: #5c5c5c ; font-family: 微软雅黑"><%= l(:label_welcome_leave_message) %> <strong><%= toggle_link l(:label_welcome_click_me), 'put-bid-form', {:focus => 'new_form_project_message'} %></strong>
+			</td>
+		</tr>
 		<tr><td colspan="5" align="center" ><div class="homepage_underline"></div></td></tr>
-		<tr><td colspan="5" align="center">
+		<tr>
+			<td colspan="5" align="center">
 				<div id="put-bid-form" style="display: none">
-			<%= form_for('new_form', :method => :post,
+				<%= form_for('new_form', :method => :post, :url => {:controller => 'words', :action => 'add_project_respond'}) do |f|%>
-			:url => {:controller => 'words', :action => 'add_project_respond'}) do |f|%>
-
 					<table border="0" width="525px" align="center" >
 						<tr>
-				<td><%= f.text_area 'project_message', :rows => 3, :cols => 65, :value => "#{l(:label_welcome_my_respond)}", :onfocus => "clearInfo('new_form_project_message','#{l(:label_welcome_my_respond)}')", :onblur => "showInfo('new_form_project_message','#{l(:label_welcome_my_respond)}')", :style => "resize: none;", :class => 'noline'%></td>
+							<td>
+								<%= f.text_area 'project_message', 
+																:rows => 3, 
+																:cols => 65, 
+																:value => "#{l(:label_welcome_my_respond)}", 
+																:onfocus => "clearInfo('new_form_project_message','#{l(:label_welcome_my_respond)}')", 
+																:onblur => "showInfo('new_form_project_message','#{l(:label_welcome_my_respond)}')", 
+																:style => "resize: none;", 
+																:class => 'noline'%>
+							</td>
 						</tr>
 					</table>
 					<table border="0" width="525px" align="center">
@@ -126,10 +168,9 @@
 						</tr>
 					</table>
 				<% end %>
-			</div></td>
+				</div>
+			</td>
 		</tr>
-		</tr>
-			
 	</table>
 </div>
 

public/stylesheets/welcome.css

@@ -0,0 +1,62 @@
+.body_resize { width:950px; margin:0 auto; padding:0;}
+.left { width:371px; float:left; margin:20px 5px 10px 5px; padding:5px;}
+
+.right { width:527px; float:left; margin:20px 5px 10px 5px; padding:5px;}
+.right ul { list-style:none; margin:5px 20px; padding:0;}
+.right li { font: bold 12px Arial, Helvetica, sans-serif; color:#6f6f6f; padding:5px 20px; margin:0; background:url(images/about_ul_li.gif) left no-repeat;}
+
+
+.body { background:#ebebeb; border-bottom:1px solid #fff; } /*没用到*/
+
+.home {
+    font:bold 16px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
+    color:#2c2c2c; 
+    border-bottom:1px solid #cccccc;
+    padding:10px 5px; 
+    margin:0 0 10px 0;
+}
+
+p {
+    font:normal 13px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
+    color:#6f6f6f; 
+    line-height:1.8em; 
+    padding:5px 5px; 
+    margin:0;
+}
+
+div.project { 
+    font:normal 15px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
+    color:#6f6f6f; 
+    line-height:1.8em; 
+    padding:5px 5px; 
+    margin:0;
+    border-bottom:1px solid #eeeeee;
+    width: 95%;
+    float: right;
+}
+div.project a{
+    color: #5B5B5B;
+}
+/*div.project{
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+}*/
+
+span.grey {
+    float: right;
+    font: normal 13px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
+    color:#afaeae; 
+    line-height:1.8em; 
+    padding:5px 5px;
+    margin:0;
+}
+p.clr, .clr { clear:both; padding:0; margin:0; background:none;}
+
+
+
+
+
+
+