Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
This commit is contained in:
xianbo
commit
1f09bfbab1
|
|
@ -313,13 +313,13 @@ class UsersController < ApplicationController
|
|||
else
|
||||
@offset ||= @user_pages.reverse_offset
|
||||
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
|
||||
limit = @user_count % @limit
|
||||
if limit == 0
|
||||
limit = @limit
|
||||
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
|
||||
@s_type = 1
|
||||
# @projects = @projects.sort {|x,y| y.created_on <=> x.created_on }
|
||||
|
|
|
|||
|
|
@ -1,23 +1,27 @@
|
|||
<div id="share_new" style = "width: 431px; center" >
|
||||
<%= form_for(@share) do |f| %>
|
||||
<div>
|
||||
分享到项目：
|
||||
<%= f.select 'project_id', options_from_collection_for_select(@ps, "id", "name") %></div>
|
||||
<div class="field">
|
||||
<%= f.text_field :title, :style => 'width: 399px;display: none;' %>
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<%= f.text_area :description, :rows => 4, :style => 'width: 100%;resize: none;', :class => 'create-share' %>
|
||||
</div>
|
||||
<div class="field">
|
||||
<%= f.label "Website:" %><br/>
|
||||
<%= f.text_field :url, :style => 'width: 100%;', :class => 'create-share' %>
|
||||
</div>
|
||||
|
||||
<div class="actions" style=" padding-top: 10px; float:right">
|
||||
<%= f.submit :value=>"分享"%>
|
||||
</div>
|
||||
<% end %>
|
||||
<br/>
|
||||
</div>
|
||||
<div id="share_new" style = "width: 500px; margin:0 auto" >
|
||||
<%= form_for(@share) do |f| %>
|
||||
<div style="width=100%; padding-top: 20px; vertical-align:baseline; text-align: right; ">
|
||||
<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>
|
||||
</div>
|
||||
<br/>
|
||||
<div class="field">
|
||||
<%= f.text_field :title, :style => 'width: 399px;display: none;' %>
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<%= f.text_area :description, :rows => 4, :style => 'width: 100%;resize: none;', :class => 'create-share' %>
|
||||
</div>
|
||||
<div class="field">
|
||||
<%= f.label "Website:" %><br/>
|
||||
<%= f.text_field :url, :style => 'width: 100%;', :class => 'create-share' %>
|
||||
</div>
|
||||
|
||||
<div class="actions" style=" padding-top: 10px; float:right">
|
||||
<%= f.submit :value=>"分享" ,:class => 'whiteButton', :style => 'font-size: 14px; padding: 3px' %>
|
||||
</div>
|
||||
<% end %>
|
||||
<br/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<h1>分享</h1>
|
||||
|
||||
<%= render 'form' %>
|
||||
|
||||
<%= link_to 'Back', shares_path %>
|
||||
<!-- h1>分享</h1 -->
|
||||
|
||||
<%= render 'form' %>
|
||||
|
||||
<!-- %= link_to '返回', shares_path % -->
|
||||
|
|
|
|||
|
|
@ -445,6 +445,7 @@ zh:
|
|||
project_module_boards: 讨论区
|
||||
project_module_calendar: 日历
|
||||
project_module_gantt: 甘特图
|
||||
label_module_share: DTS测试工具
|
||||
|
||||
label_user: 用户
|
||||
label_user_plural: 用户
|
||||
|
|
@ -1643,7 +1644,6 @@ zh:
|
|||
label_noawards: 未评奖
|
||||
|
||||
label_course_modify_settings: 配置课程
|
||||
label_module_share: dts测试工具
|
||||
label_homework_prompt: 贴心小提示：
|
||||
label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以
|
||||
label_create_homework: 布置了作业：
|
||||
|
|
|
|||
|
|
@ -1,55 +1,54 @@
|
|||
/*add by nyan*/
|
||||
.whiteButton {
|
||||
|
||||
-moz-box-shadow:inset 0px 1px 0px 0px #ffffff;
|
||||
-webkit-box-shadow:inset 0px 1px 0px 0px #ffffff;
|
||||
box-shadow:inset 0px 1px 0px 0px #ffffff;
|
||||
|
||||
background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #ffffff), color-stop(1, #f6f6f6));
|
||||
background:-moz-linear-gradient(top, #ffffff 5%, #f6f6f6 100%);
|
||||
background:-webkit-linear-gradient(top, #ffffff 5%, #f6f6f6 100%);
|
||||
background:-o-linear-gradient(top, #ffffff 5%, #f6f6f6 100%);
|
||||
background:-ms-linear-gradient(top, #ffffff 5%, #f6f6f6 100%);
|
||||
background:linear-gradient(to bottom, #ffffff 5%, #f6f6f6 100%);
|
||||
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f6f6f6',GradientType=0);
|
||||
|
||||
background-color:#ffffff;
|
||||
|
||||
-moz-border-radius:6px;
|
||||
-webkit-border-radius:6px;
|
||||
border-radius:6px;
|
||||
|
||||
border:1px solid #dcdcdc;
|
||||
|
||||
display:inline-block;
|
||||
color:#666666;
|
||||
font-family:arial;
|
||||
font-size:15px;
|
||||
font-weight:bold;
|
||||
padding:6px 24px;
|
||||
text-decoration:none;
|
||||
|
||||
text-shadow:0px 1px 0px #ffffff;
|
||||
|
||||
}
|
||||
.whiteButton:hover {
|
||||
|
||||
background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #f6f6f6), color-stop(1, #ffffff));
|
||||
background:-moz-linear-gradient(top, #f6f6f6 5%, #ffffff 100%);
|
||||
background:-webkit-linear-gradient(top, #f6f6f6 5%, #ffffff 100%);
|
||||
background:-o-linear-gradient(top, #f6f6f6 5%, #ffffff 100%);
|
||||
background:-ms-linear-gradient(top, #f6f6f6 5%, #ffffff 100%);
|
||||
background:linear-gradient(to bottom, #f6f6f6 5%, #ffffff 100%);
|
||||
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f6f6f6', endColorstr='#ffffff',GradientType=0);
|
||||
|
||||
background-color:#f6f6f6;
|
||||
}
|
||||
.whiteButton:active {
|
||||
position:relative;
|
||||
top:1px;
|
||||
}
|
||||
|
||||
#share_project_id {
|
||||
float: right;
|
||||
width: 100%;
|
||||
/*add by nyan*/
|
||||
.whiteButton {
|
||||
|
||||
-moz-box-shadow:inset 0px 1px 0px 0px #ffffff;
|
||||
-webkit-box-shadow:inset 0px 1px 0px 0px #ffffff;
|
||||
box-shadow:inset 0px 1px 0px 0px #ffffff;
|
||||
|
||||
background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #ffffff), color-stop(1, #f6f6f6));
|
||||
background:-moz-linear-gradient(top, #ffffff 5%, #f6f6f6 100%);
|
||||
background:-webkit-linear-gradient(top, #ffffff 5%, #f6f6f6 100%);
|
||||
background:-o-linear-gradient(top, #ffffff 5%, #f6f6f6 100%);
|
||||
background:-ms-linear-gradient(top, #ffffff 5%, #f6f6f6 100%);
|
||||
background:linear-gradient(to bottom, #ffffff 5%, #f6f6f6 100%);
|
||||
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f6f6f6',GradientType=0);
|
||||
|
||||
background-color:#ffffff;
|
||||
|
||||
-moz-border-radius:6px;
|
||||
-webkit-border-radius:6px;
|
||||
border-radius:6px;
|
||||
|
||||
border:1px solid #dcdcdc;
|
||||
|
||||
display:inline-block;
|
||||
color:#666666;
|
||||
font-family:arial;
|
||||
font-size:15px;
|
||||
font-weight:bold;
|
||||
padding:6px 24px;
|
||||
text-decoration:none;
|
||||
|
||||
text-shadow:0px 1px 0px #ffffff;
|
||||
|
||||
}
|
||||
.whiteButton:hover {
|
||||
|
||||
background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #f6f6f6), color-stop(1, #ffffff));
|
||||
background:-moz-linear-gradient(top, #f6f6f6 5%, #ffffff 100%);
|
||||
background:-webkit-linear-gradient(top, #f6f6f6 5%, #ffffff 100%);
|
||||
background:-o-linear-gradient(top, #f6f6f6 5%, #ffffff 100%);
|
||||
background:-ms-linear-gradient(top, #f6f6f6 5%, #ffffff 100%);
|
||||
background:linear-gradient(to bottom, #f6f6f6 5%, #ffffff 100%);
|
||||
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f6f6f6', endColorstr='#ffffff',GradientType=0);
|
||||
|
||||
background-color:#f6f6f6;
|
||||
}
|
||||
.whiteButton:active {
|
||||
position:relative;
|
||||
top:1px;
|
||||
}
|
||||
|
||||
#share_label {
|
||||
line-height: 1.4em
|
||||
}
|
||||
Loading…
Reference in New Issue