fix

qingping · Sep 12, 2010 · 8ce867f · 8ce867f
1 parent cdca248
commit 8ce867f
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 16 deletions.
diff --git a/app/views/forms/chart.html.erb b/app/views/forms/chart.html.erb
@@ -21,6 +21,6 @@
   </div>
 </div>
 
-<% content_for :sidebar do %>  
+<% content_for :sidebar do %>    
   <%= render :partial => '/rows/answer_sidebar' %> 
 <% end %>
diff --git a/app/views/forms/index.html.erb b/app/views/forms/index.html.erb
@@ -47,7 +47,7 @@
 <%=raw(will_paginate @forms,:class => 'flickr_pagination',:previous_label => t(:prev),:next_label => t(:next)) %> 
   </div>
 
-<% content_for :sidebar do %>           
+<% content_for :sidebar do %>
   <%= render :partial => t(:sidebar) %>       
 <% end %>
   

diff --git a/app/views/forms/stats.html.erb b/app/views/forms/stats.html.erb
@@ -27,6 +27,6 @@
   </div>
 </div>
 
-<% content_for :sidebar do %>  
+<% content_for :sidebar do %>      
   <%= render :partial => '/rows/answer_sidebar' %> 
 <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -6,7 +6,7 @@
 <body>     
   <%= render :partial => '/shared/header' %>  
 	<div class="container">   
-      <div class='span-5'>
+      <div class='span-5 sidebar'>
 	       <%= yield :sidebar %>
 	    </div>
       <div class='span-19 content last'>

diff --git a/app/views/rows/_answer_sidebar.html.erb b/app/views/rows/_answer_sidebar.html.erb
@@ -1,5 +1,6 @@
-<div class='box'>
-  <ul class='sidebar_nav'>    
+<div class='box'>                
+  <h3 class='sidenav'><%=t(:guide)%></h3>         
+  <ul class='sidebar_nav'>       
     <li class="<%= 'current' if @tab == 'answers' %>"><%=link_to t(:answers), form_rows_path(@form, :edit_key => @form.edit_key) %> </li> 
     <li class="<%= 'current' if @tab == 'chart' %>"><%= link_to t(:report), chart_form_path(@form)%></li>
     <li class="<%= 'current' if @tab == 'stats' %>"><%= link_to t(:visits), stats_form_path(@form) %></li>

diff --git a/app/views/rows/index.html.erb b/app/views/rows/index.html.erb
@@ -65,6 +65,6 @@
 </div>    
 <% end %>
 
-<% content_for :sidebar do %>
+<% content_for :sidebar do %>     
   <%= render :partial => 'rows/answer_sidebar' %> 
 <% end %>
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
@@ -196,7 +196,7 @@
   other: "其它"
   send_email_when_receive_new_answer: "收到新回应时发送邮件通知。"
   embed_form_in_your_site: "将以下代码粘贴到您的网页中:"
-  answers: "回应"
+  answers: "所有回应"
   thanks_message: "用户提交回答后的感谢信息"
   add_other: "允许用户填写其它选择"
   option_one: "选项 #1"
@@ -271,4 +271,5 @@
   locale: "表单语言"
   next: '下一题'
   home: '首页'
-  agreement: 服务协议
+  agreement: 服务协议
+  guide: '导航'
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -447,6 +447,7 @@ div.info_item{
 }    
 
 #rows{
+	border:1px solid #E3E3E3;
 	width:100%;
 }
 
@@ -457,6 +458,7 @@ div.info_item{
 
 div.info_item{
 	padding:5px;
+	color:#333;
 }   
 
 div.time{   
@@ -466,7 +468,7 @@ div.time{
 }
 
 #results{  
-	margin:10px 0;   
+	margin:0px 0 10px;   
 	text-align:center;      
 	width:100%;
 	overflow:auto;
@@ -639,9 +641,9 @@ input.btn, button.btn {
 
 
 /* --  section ----*/
-.section_nav{
+.section_nav{ 
 	height:32px;     
-	margin:10px 0;
+	margin:0px 0 10px;
 	line-height:32px;
 	border-bottom:2px solid #efefef;
 }              
@@ -661,13 +663,19 @@ input.btn, button.btn {
 .sidebar_nav li a{  
 	border-bottom:1px solid #efefef;
 	display:block;
-	padding:3px 5px;
+	padding:1px 5px;
+	margin:5px 0px;
 } 
 
 .sidebar_nav li a:hover, .sidebar_nav li.current a{ 
-	color:#fff;
-	text-decoration: none; 
-	background:#4B4B4B;
+	text-decoration: none;                          
+	border:1px solid #ccc;
+	color:#0099FF;
+	background:#F6F6F6;
+} 
+
+.sidebar a{
+	color:#333;
 }
 
 .count{
@@ -678,4 +686,9 @@ input.btn, button.btn {
 .tip{
 	text-align:right;
 	color:#999;
+}
+
+.sidenav{
+	padding:5px;
+	margin-bottom:10px;
 }