Merge branch 'dev_cxt2' into szzh

app/helpers/members_helper.rb

@@ -38,7 +38,7 @@ module MembersHelper
       scope = []
     end
     principals = paginateHelper scope,10
-    s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5')
+    s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals')
     links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true){|text, parameters, options|
       link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q],:flag => true, :format => 'js')), :remote => true
     }

app/views/account/lost_password.html.erb

@@ -9,7 +9,7 @@
   <div class="box tabular">
     <p>
       <label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
-      <%= text_field_tag 'mail', nil, :size => 40 %>
+      <%= text_field_tag 'mail', nil, :size => 40, :placeholder => '请输入注册邮箱'%>
       <%= submit_tag l(:button_submit) %>
     </p>
   </div>

app/views/layouts/base_users_new.html.erb

@@ -41,7 +41,7 @@
     <div id="LSide" class="fl">
       <div class="users_info">
         <div class="pic_head">
-          <%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:216px;height:216px;",:alt=>"头像") %>
+          <%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:214px;height:214px;overflow:hidden",:alt=>"头像") %>
           <% if @center_flag %>
           <a href="<%= url_for(:controller => 'my', :action => 'clear_user_avatar_temp') %>" data-remote="true" class="pic_edit usersphoto_edit"></a>
           <% end %>
@@ -71,7 +71,7 @@
 
       <div class="leftbox mt10">
         <ul class="leftbox_ul_left">
-          <li>加入时间&nbsp;:</li>
+          <li>最近登录&nbsp;:</li>   <!--加入时间修改为最近登录 -->
           <% if @user.user_extensions!=nil && @user.user_extensions.identity == 2 %>
             <li><%= l(:label_company_name) %>&nbsp;:</li>
           <% elsif !@user.firstname.empty? || !@user.lastname.empty? %>
@@ -99,7 +99,7 @@
           <% end %>
         </ul>
         <ul class="leftbox_ul_right c_dgrey">
-          <li><%= format_date(@user.created_on) %></li>
+          <li><%= format_date(@user.last_login_on) %></li>  <!-- 加入时间修改为最近登录时间-->
           <% if @user.user_extensions.identity == 0 %>
               <li style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="<%= @user.show_name %>"><%= @user.show_name %></li>
           <% end %>
@@ -247,7 +247,7 @@
         <span>48px*48px</span> <br />
       </div>
       <div class="cl mb10"></div>
-      <a href="javascript:hideModal();" class=" fr grey_btn mr2"> 取&nbsp;&nbsp;消</a>
+      <a href="javascript:hideModal();" class=" fr grey_btn mr15"> 取&nbsp;&nbsp;消</a>
       <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10">确&nbsp;&nbsp;定</a>
 
     </div><!--talknew end-->

app/views/members/autocomplete.js.erb

@@ -1,4 +1,9 @@
  <% if @project%>
+    var checked = $("#principals input:checked").size();
+    if(checked > 0)
+    {
+       alert('翻页或搜索后将丢失当前选择的用户数据!');
+    }
     <% if @flag == "true"%>
         $('#principals_for_new_member').html('<%= escape_javascript(render_project_members(@project)) %>');
     <% else%>

app/views/my/clear_user_avatar_temp.js.erb

@@ -5,3 +5,4 @@
     $('#ajax-modal').parent().removeClass("alert_praise");
     //$('#ajax-modal').parent().css("top","").css("left","");
     $('#ajax-modal').parent().addClass("alert_box");
+    $('#ajax-modal').parent().css("border", "2px solid #15bccf").css("border-radius", "0").css(" -webkit-border-radius", "0").css(" -moz-border-radius", "0");

app/views/my/save_user_avatar.js.erb

@@ -1,2 +1,2 @@
-$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:216px;height:216px;",:alt=>"头像") %>');
+$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:214px;height:214px;overflow:hidden",:alt=>"头像") %>');
 hideModal();

app/views/projects/search.html.erb

@@ -69,12 +69,12 @@
                           }
                         </script>
                         <div class="project-search" style="float: right">
-                            <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();", :style => "float:left" %>
+                            <%= text_field_tag 'name', params[:name], :size => 30, :onkeyup => "regexName();" %>
                             <%= hidden_field_tag 'project_type', params[:project_type] %>
-                            <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+                            <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>  <!--修改项目搜索按钮的样式 -->
-                            <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
+                           <!-- <a href="#" onclick="submitSerch();" class="ButtonColor m3p10"  style="float:left;padding-top: 3px; margin: 0px;padding-bottom:0px;" >
                               <%= l(:label_search)%>
-                            </a>
+                            </a> -->
                             <br />
                             <span id="project_name_span" style="float: left"></span>
                         </div>

app/views/users/_user_fans_item.html.erb

@@ -1,6 +1,6 @@
     <div class="courses_list line" id="fans_item_<%=item.id%>">
       <div class="courses_list_pic fl">
-        <a href="javascirpt:void();">
+        <a href="<%= user_path(item) %>">
           <%= image_tag(url_to_avatar(item), :style=>"width:64px;height:64px;",:alt=>"头像") %>
         </a>
       </div>

db/schema.rb

@@ -454,13 +454,6 @@ ActiveRecord::Schema.define(:version => 20150722015428) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -861,6 +854,7 @@ ActiveRecord::Schema.define(:version => 20150722015428) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
+    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"

public/stylesheets/users.css

@@ -113,7 +113,7 @@ a:hover.c_lgrey{ color:#3ca5c6;}
 /* 20150506上传头像*/
 .uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666;  text-align:center;}
 .showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;}
-.mr2{ margin-right:2px;}
+.mr15{ margin-right:15px;}
 .uppic_btn{border:none; width:150px; background:none; margin-bottom:5px; color:#666; margin-top:105px;}
 /* 新建作品*/
 .mr8{ margin-right:8px;}