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

app/controllers/users_controller.rb

@@ -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 }

app/views/shares/_form.html.erb

@@ -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| %>
+  <div style="width=100%; padding-top: 20px; vertical-align:baseline; text-align: right; ">
     <div>
-   分享到项目：
-   <%= f.select 'project_id', options_from_collection_for_select(@ps, "id", "name") %></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>
@@ -16,7 +20,7 @@
 </div>
 
 <div class="actions" style=" padding-top: 10px; float:right">
-    <%= f.submit :value=>"分享"%>
+  <%= f.submit :value=>"分享" ,:class => 'whiteButton', :style => 'font-size: 14px; padding: 3px' %>
 </div>
 <% end %>
 <br/>

app/views/shares/new.html.erb

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

config/locales/zh.yml

@@ -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: 布置了作业：

public/stylesheets/nyan.css

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