jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug 

Signed-off-by: alan <547533434@qq.com>
This commit is contained in:
alan 2015-01-12 17:56:09 +08:00
parent dbe9466e4d
commit 90925edce2
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/layouts/_base_feedback.html.erb
View File

@ -62,7 +62,7 @@ function f_submit()
<style type="text/css">
/*浮窗*/
body{ height:3000px; font-family:'微软雅黑';}
div,ul,li,body,h3,p{margin:0; padding:0;}
a{ text-decoration:none;}
#roll{ background:url(/images/f_opnion.jpg) 0 0 no-repeat;width:157px; height:332px; position:absolute;}
.opnionBox{ width: 130px; height:146px; margin:76px auto 20px; }
@ -101,10 +101,10 @@ a:hover.opnionButton{ text-decoration:underline;}
<% get_memo %>
<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %>
<div class="actions" style="max-width:680px">
<p>
<p style="margin:0; padding:0;">
<%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
</p>
<p>
<p style="margin:0; padding:0;">
<%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
</p>
<%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>

15
lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
View File

@ -91,12 +91,19 @@ module Redmine
ActiveSupport::Deprecation.warn "acts_as_activity_provider with implicit :permission option is deprecated. Add a visible scope to the #{self.name} model or use explicit :permission option."
scope = scope.scoped(:conditions => Project.allowed_to_condition(user, "view_#{self.name.underscore.pluralize}".to_sym, options))
end
to = scope.select(:created_on).order("created_on desc").first.created_on
if options[:course]
from = (to - days) > created_time ? (to - days) : created_time.to_date
unless scope.all(provider_options[:find_options].dup).first.nil?
if provider_options[:timestamp].include? "updated_on"
to = scope.scoped(:order => "#{provider_options[:timestamp]} desc").all(provider_options[:find_options].dup).first.updated_on
else
from = to - days -1.years
to = scope.scoped(:order => "#{provider_options[:timestamp]} desc").all(provider_options[:find_options].dup).first.created_on
end
if options[:course]
from = (to - days.days) > created_time ? (to - days.days) : created_time.to_date
else
from = to - days.days - 1.years
end
end
if from && to
scope = scope.scoped(:conditions => ["#{provider_options[:timestamp]} BETWEEN ? AND ?", from, to])
end