Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

Gemfile

@@ -50,10 +50,10 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 #rails 3.2.22.2 bug
- #gem "test-unit", "~>3.0"
+ gem "test-unit", "~>3.0"
 
 ### profile
-# gem 'oneapm_rpm'
+ gem 'oneapm_rpm'
 
 group :development do
   gem 'grape-swagger'

app/views/files/_file_description.html.erb

@@ -1,5 +1,5 @@
 <p ondblclick=show_edit_file_description('<%= file.id %>')>
-  资源描述：<% if file.description.blank? %><span style="color:#C5C5BE; cursor:pointer;" title="双击可编辑">双击添加描述</span><% else %><span style="cursor:pointer;" title="双击可编辑"><%= file.description %></span><% end %>
+  <span style="white-space:nowrap;">资源描述：</span><% if file.description.blank? %><span style="color:#C5C5BE; cursor:pointer;" title="双击可编辑">双击添加描述</span><% else %><span style="cursor:pointer;" title="双击可编辑" class="break_word"><%= file.description %></span><% end %>
   <%#= file.description.blank? ? "该资源暂无描述" : file.description %>
   <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_file_description("+file.id.to_s+");"%>
 </p>

app/views/projects/_project_issue_contents.html.erb

@@ -7,20 +7,17 @@
     <% parents_rely = get_reply_parents parents_rely, comment %>
     <% length = parents_rely.length %>
     <div id="comment_reply_<%=comment.id %>">
-      <% if length <= 3 %>
+      <% if length <= 2 %>
           <%=render :partial => 'projects/project_issue_comments_reply', :locals => {:comment => comment.parent} %>
       <% else %>
           <div class="orig_cont clearfix">
             <div class="orig_cont clearfix">
-              <div>
+              <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[length - 1]} %>
-                <%=render :partial => 'projects/project_issue_comments_reply', :locals => {:comment => parents_rely[length - 1]} %>
             </div>
-              <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+            <div class="orig_cont_hide_issue clearfix">
-            </div>
-            <div class="orig_cont_hide clearfix">
               <span class="orig_icon" >&darr; </span>
-              <span class="orig_icon" style="display:none;" > &uarr;</span>
+              <span class="orig_icon" style="display:none;" > &uarr;</span><span class="">已经隐藏<%=(length - 2).to_s %>个楼层</span>
-              <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
+              <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class), :remote=>true, :class => 'linkBlue2' %>
             </div>
             <%=render :partial => 'projects/project_issue_comments_reply_detail', :locals => {:comment => parents_rely[0]} %>
           </div>

app/views/versions/_new_milestone.html.erb

@@ -12,13 +12,13 @@
       <%#= labelled_form_for @version, :html => {:id => "popub_new_project_version_form", :remote => true, :is_setting => true, :is_index => params[:is_index] } do |f| %>
           <ul class="pro_newsetting_con mb15 ">
             <li class="mb10 clear">
-              <label class=" fl"><span class="c_red f12">*</span>&nbsp;名称&nbsp;&nbsp;:&nbsp;</label>
+              <label><span class="c_red f12">*</span>&nbsp;名称&nbsp;&nbsp;:&nbsp;</label>
-              <%= f.text_field :name, :maxlength => 60, :class=>"w650 fl", :style=>"height: 28px;", :id => "popub_setting_version_name", :no_label => true %>
+              <%= f.text_field :name, :maxlength => 60, :class=>"w650", :style=>"height: 28px;", :id => "popub_setting_version_name", :no_label => true %>
               <p class="c_orange ml100" style="display: none" id="pupub_project_setting_version_title">标题不能为空</p>
             </li>
             <li class="mb10 clear">
-              <label class=" fl">&nbsp;描述&nbsp;&nbsp;:&nbsp;</label>
+              <label>&nbsp;描述&nbsp;&nbsp;:&nbsp;</label>
-              <%= f.text_field :description, :maxlength => 60, :class=>"w650 fl", :style=>"height:28px;", :no_label => true %>
+              <%= f.text_field :description, :maxlength => 60, :class=>"w650", :style=>"height:28px;", :no_label => true %>
             </li>
             <!--<li class="mb10 clear">-->
               <!--<label class=" fl">&nbsp;结束日期&nbsp;&nbsp;:&nbsp;</label>-->
@@ -28,7 +28,7 @@
               <!--&lt;!&ndash;<a href="" class="issues_data_img fl"></a>&ndash;&gt;-->
             <!--</li>-->
             <li class="mb10 clear">
-              <label class=" fl">&nbsp;状态&nbsp;&nbsp;:&nbsp;</label>
+              <label>&nbsp;状态&nbsp;&nbsp;:&nbsp;</label>
               <%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]},{:no_label => true },{:style=>"height:28px;"}  %>
             </li>
           </ul>

db/schema.rb

@@ -333,8 +333,6 @@ ActiveRecord::Schema.define(:version => 20161028053000) do
     t.date     "commit_date"
     t.string   "scmid"
     t.integer  "user_id"
-    t.integer  "project_id"
-    t.integer  "type",          :default => 0
   end
 
   add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
@@ -995,10 +993,6 @@ ActiveRecord::Schema.define(:version => 20161028053000) do
     t.datetime "updated_at",         :null => false
   end
 
-  create_table "innodb_monitor", :id => false, :force => true do |t|
-    t.integer "a"
-  end
-
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1465,6 +1459,8 @@ ActiveRecord::Schema.define(:version => 20161028053000) do
     t.datetime "created_at",                     :null => false
     t.datetime "updated_at",                     :null => false
     t.integer  "question_number"
+    t.integer  "max_choices",     :default => 0
+    t.integer  "min_choices",     :default => 0
   end
 
   create_table "poll_users", :force => true do |t|

public/stylesheets/css/project.css

@@ -943,7 +943,7 @@ p.pro_new_grey{ line-height: 1.9; }
 .undis {display:none;}
 .dis {display:block;}
 .new_roadmap_listbox{ padding:15px;border-bottom:1px solid #dbdbdb;}
-.new_roadmap_listtitle a{ color: #333;display:block;max-width:840px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
+.new_roadmap_listtitle a{ color: #333;display:block;max-width:800px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
 .new_roadmap_listtitle a:hover{ color:#3498db;}
 .new_roadmap_list_txt{ color: #666;}
 .new_roadmap_list_txt li{ float: left; margin-right: 10px;}

public/stylesheets/css/public.css

@@ -1398,7 +1398,8 @@ a:hover.comment_ding_link{ color:#269ac9;}
 .orig_textarea{width:90%;  margin-bottom:10px;}
 .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
 .orig_sub:hover{ background:#297fb8;}
-.orig_cont_hide{ text-align:center; width:624px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:5px 0;}
+.orig_cont_hide{ text-align:center; width:632px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:5px 0;}
+.orig_cont_hide_issue{ text-align:center; width:882px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:5px 0;}
 .orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}
 
 .relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}