From 5893d7fc155239de0c1a70864fcebdc116e63b7a Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 20 Feb 2016 17:24:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9A=E7=BB=84=E7=BB=87=E8=B5=84=E6=BA=90=E6=A0=8F=E7=9B=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_org_subfield_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 7a5d95125..866cf6fd8 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -72,7 +72,7 @@
         <%=link_to "点击展开更多",  search_files_in_subfield_org_subfield_files_path(:org_subfield_id => org_subfield.id,:page => @page.to_i + 1, :name => params[:name],:insite => params[:insite]),:id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
     <% else %>
         <!-- 全站搜索的时候 返回的页码对象是obj_pages,而站内搜索返回的页码对象是feedback_pages -->
-        <%=link_to "点击展开更多",  org_subfield_files_path(:org_subfield_id => org_subfield.id, :page => @page.nil? ? 2 :(@page + 1)), :id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
+        <%=link_to "点击展开更多",  org_subfield_files_path(:org_subfield_id => org_subfield.id, :page => @page.nil? ? 2 :(@page.to_i + 1)), :id => "show_more_attachments",:remote => "true",:class => "loadMore mt10 f_grey" %>
     <%end%>
 <% end%>
 

From 808f9a6b7a138fcb9cb93c9b50bc997fddf8c24a Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 20 Feb 2016 17:40:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=A0=B7=E5=BC=8F=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/org.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 02b2e71bb..06c8022c6 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -69,7 +69,7 @@ a.linkGrey8:hover {color:#585858;}
 .orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px;
                    position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
-#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
+#orgUserName {display:inline-block;}
 .org_login_list a {color:#269ac9;}
 
 .orgListStatus {width:55px; float:left;}

From d84da7908d535f3661f162a0e2e1f35018e735b2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 20 Feb 2016 17:43:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5=E7=BB=93=E6=9E=9C=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index 75b07557e..b04f96db5 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -62,7 +62,7 @@
         <% if has_commit%>
             <li><%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fr mr10"%></li>
         <%else%>
-            <li class="pollsbtn fr mr10 pollsbtn_grey">统计结果</li>
+            <li class="pollsbtn fr mr10 pollsbtn_grey" title="请先提交问卷再查看统计结果">统计结果</li>
         <%end%>
     <% end %>
 <% end%>
\ No newline at end of file