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

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
xianbo 2013-10-28 20:09:43 +08:00
parent e9856b3524 1f8c10e48a
commit 1f09bfbab1
5 changed files with 88 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/users_controller.rb
View File

@ -313,13 +313,13 @@ class UsersController < ApplicationController
else else
@offset ||= @user_pages.reverse_offset @offset ||= @user_pages.reverse_offset
unless @offset == 0 unless @offset == 0
@users_statuses = scope.reorder('changesets_count').offset(@offset).limit(@limit).all.reverse @users_statuses = scope.reorder('grade').offset(@offset).limit(@limit).all.reverse
else else
limit = @user_count % @limit limit = @user_count % @limit
if limit == 0 if limit == 0
limit = @limit limit = @limit
end end
@users_statuses = scope.reorder('changesets_count').offset(@offset).limit(limit).all.reverse @users_statuses = scope.reorder('grade').offset(@offset).limit(limit).all.reverse
end end
@s_type = 1 @s_type = 1
# @projects = @projects.sort {|x,y| y.created_on <=> x.created_on } # @projects = @projects.sort {|x,y| y.created_on <=> x.created_on }

12
app/views/shares/_form.html.erb
View File

@ -1,8 +1,12 @@
<div id="share_new" style = "width: 431px; center" > <div id="share_new" style = "width: 500px; margin:0 auto" >
<%= form_for(@share) do |f| %> <%= form_for(@share) do |f| %>
<div style="width=100%; padding-top: 20px; vertical-align:baseline; text-align: right; ">
<div> <div>
分享到项目： <strong style="height:25px; line-height:25px; " id="share_label" >分享到：</strong>
<%= f.select 'project_id', options_from_collection_for_select(@ps, "id", "name") %></div> <%= f.select 'project_id', options_from_collection_for_select(@ps, "id", "name") %>
</div>
</div>
<br/>
<div class="field"> <div class="field">
<%= f.text_field :title, :style => 'width: 399px;display: none;' %> <%= f.text_field :title, :style => 'width: 399px;display: none;' %>
</div> </div>
@ -16,7 +20,7 @@
</div> </div>
<div class="actions" style=" padding-top: 10px; float:right"> <div class="actions" style=" padding-top: 10px; float:right">
<%= f.submit :value=>"分享"%> <%= f.submit :value=>"分享" ,:class => 'whiteButton', :style => 'font-size: 14px; padding: 3px' %>
</div> </div>
<% end %> <% end %>
<br/> <br/>

4
app/views/shares/new.html.erb
View File

@ -1,5 +1,5 @@
<h1>分享</h1> <!-- h1>分享</h1 -->
<%= render 'form' %> <%= render 'form' %>
<%= link_to 'Back', shares_path %> <!-- %= link_to '返回', shares_path % -->

2
config/locales/zh.yml
View File

@ -445,6 +445,7 @@ zh:
project_module_boards: 讨论区 project_module_boards: 讨论区
project_module_calendar: 日历 project_module_calendar: 日历
project_module_gantt: 甘特图 project_module_gantt: 甘特图
label_module_share: DTS测试工具
label_user: 用户 label_user: 用户
label_user_plural: 用户 label_user_plural: 用户
@ -1643,7 +1644,6 @@ zh:
label_noawards: 未评奖 label_noawards: 未评奖
label_course_modify_settings: 配置课程 label_course_modify_settings: 配置课程
label_module_share: dts测试工具
label_homework_prompt: 贴心小提示： label_homework_prompt: 贴心小提示：
label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以 label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以
label_create_homework: 布置了作业： label_create_homework: 布置了作业：

5
public/stylesheets/nyan.css
View File

@ -49,7 +49,6 @@
top:1px; top:1px;
} }
#share_project_id { #share_label {
float: right; line-height: 1.4em
width: 100%;
} }