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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2014-06-12 16:43:34 +08:00
parent 277aa81a60 858a7936b5
commit b7458abd9e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user_score.rb
View File

@ -122,8 +122,8 @@ class UserScore < ActiveRecord::Base
Rails.logger.error "[UserScore#influence] ===> #{operate} is not define." Rails.logger.error "[UserScore#influence] ===> #{operate} is not define."
return false return false
end end
#rescue => e rescue => e
#Rails.logger.error "[UserScore#influence] ===> Exception: #{e}." Rails.logger.error "[UserScore#influence] ===> Exception: #{e}."
end end
# 前略·技术得分 # 前略·技术得分

3
app/views/layouts/_base_footer.html.erb
View File

@ -1,4 +1,5 @@
<!--add by huang--> <!--add by huang-->
<% cache "footer" do %>
<div class="clearfix"></div> <div class="clearfix"></div>
<div id="footer" style="margin-left:-5px;padding-top: 20px;clear: both;font-size: 12px;"> <div id="footer" style="margin-left:-5px;padding-top: 20px;clear: both;font-size: 12px;">
<div style="border-top:solid 1px #C6E9F1;"></div> <div style="border-top:solid 1px #C6E9F1;"></div>
@ -44,3 +45,5 @@
</script> </script>
</div> </div>
<% end %>