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

app/views/attachments/_show_attachment_history.html.erb

@@ -16,8 +16,9 @@
         <span class="attachment">
           <%= link_to truncate(history.filename,length: 35, omission: '...'),
                       download_history_attachment_path(history.id, history.filename),
-                      :title => history.filename+"\n"+history.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkBlue f_14 f_b"  %>
-          <span>版本号：<%= history.version %></span>
+                      :title => history.filename+"\n"+history.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f_14 f_b link_file_a2 fl"  %>
+          <span class="fr">版本号：<%= history.version %></span>
+          <div class="cl"></div>
         </span>
 
     <% end %>

app/views/users/search_user_course.js.erb

@@ -1,10 +1,8 @@
-var screenWidth = $(window).width();
-var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
-var boxWidth = 452;
-
-var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
-var objLeft = (screenWidth - boxWidth)/2 ;   //2 可以根据需要修改
-var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
+//var screenWidth = $(window).width();
+//var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
+//var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
+//var objLeft = (screenWidth - 2)/2.5 ;   //2 可以根据需要修改
+//var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
 //var popupHeight = $(".resourceSharePopup").outerHeight(true);
 //$(".resourceSharePopup").css("marginTop",-popupHeight/2);
 //
@@ -21,7 +19,7 @@ var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top",objTop+"px").css("left", objLeft+200+ "px");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 var val =  $("#search_course_input").val();

app/views/users/search_user_org.js.erb

@@ -5,19 +5,10 @@
 <% elsif params[:send_type] == 'message' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% end %>
-
-var screenWidth = $(window).width();
-var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
-var boxWidth = 452;
-
-var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
-var objLeft = (screenWidth - boxWidth)/2 ;   //2 可以根据需要修改
-var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
-
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top",objTop+"px").css("left",objLeft+200+"px");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 var val =  $("#search_org_input").val();

app/views/users/search_user_project.js.erb

@@ -5,19 +5,10 @@
 <% elsif params[:send_type] == 'message' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% end %>
-
-var screenWidth = $(window).width();
-var screenHeight = $(window).height(); //当前浏览器窗口的 宽高
-var boxWidth = 452;
-
-var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度
-var objLeft = (screenWidth - boxWidth)/2 ;   //2 可以根据需要修改
-var objTop = (screenHeight - 100)/2 + scrolltop;  //100可以根据需要修改
-
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top",objTop+"px").css("left",objLeft+200+"px");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 //$("#search_project_input").focus();

db/schema.rb

@@ -1219,6 +1219,7 @@ ActiveRecord::Schema.define(:version => 20160202034530) do
   create_table "org_members", :force => true do |t|
     t.integer  "user_id"
     t.integer  "organization_id"
+    t.string   "role"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
   end

public/stylesheets/courses.css

@@ -1083,6 +1083,7 @@ a.c_grey{ color:#999999;}
 a:hover.c_grey{ color:#333;}
 a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .last_time{width:auto; text-align:right; margin-right:70px;}
 .link_file_box{ width:360px;}