diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 41b9201ba..7e549509b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -339,11 +339,8 @@ class ProjectsController < ApplicationController end # 邀请Trustie注册用户 - def invite_members_had_loged + def invite_members @member ||= @project.members.new - respond_to do |format| - format.js - end end def edit diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index f47ced545..971bf603d 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -31,7 +31,7 @@ module WatchersHelper watched = objects.any? {|object| object.watched_by?(user)} @watch_flag = (objects.first.instance_of?(User) or objects.first.instance_of?(Project) or objects.first.instance_of?(Contest) or (objects.first.instance_of?(Bid))) - css = @watch_flag ? ([watcher_css(objects), watched ? 'icon ' : 'icon '].join(' ') << options[0].to_s) : + css = @watch_flag ? ([watcher_css(objects), watched ? 'icon ' : 'icon '].join(' ') << options[0].to_s) : ([watcher_css(objects), watched ? 'icon icon-fav ' : 'icon icon-fav-off '].join(' ') << options[0].to_s) text = @watch_flag ? @@ -283,6 +283,6 @@ module WatchersHelper def exit_project_link(project) link_to(l(:label_exit_project),exit_cur_project_path(project.id), - :remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px;margin-right:10px;height:20px;text-aligh:center;" ) + :remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px;margin-right:10px;height:22px;background:none repeat scroll 0% 0% #64BDD9;TES" ) end end diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index f7e4a2132..40f13a2f8 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -129,8 +129,8 @@
邀请
<%= link_to "动态", {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb new file mode 100644 index 000000000..052ee92ef --- /dev/null +++ b/app/views/projects/invite_members.html.erb @@ -0,0 +1,67 @@ +
+

邀请加入

+
+<%= error_messages_for 'member' %> +<% + roles = Role.givable.all + if @project.project_type == Project::ProjectType_course + roles = roles[3..5] + else + roles = roles[0..2] + end + members = @project.member_principals.includes(:roles, :principal).all.sort +%> + +
+
+
+
+
+

邀请Trustie注册用户

+ <% if roles.any? %> + <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %> + +
+ <%= label_tag "principal_search", l(:label_principal_search) %> + <%= text_field_tag 'principal_search', nil %> + <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %> + +
+ <%= render_principals_for_new_members(@project) %> +
+

+ <%= l(:label_role_plural) %>: + <% roles.each do |role| %> + + <% end %> +

+

+ <%= submit_tag l(:button_add), :id => 'member-add-submit', :style => 'display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;' %> +

+ <% end %> + <% end %> +
+ + + +
+ +
+
+ \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index b105dabc3..f61253e5e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -368,6 +368,7 @@ RedmineApp::Application.routes.draw do get 'feedback', :action => 'feedback', :as => 'project_feedback' get 'watcherlist', :action=> 'watcherlist' + get 'invite_members', :action=> 'invite_members' match 'user_watcherlist', :to => 'projects#watcherlist', :via => :get, :as => "watcherlist" #add by huang get 'homework', :action => 'homework', :as => 'homework' get 'new_homework', :action => 'new_homework', :as => 'new_homework' diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 73cfdf762..7d3506124 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -102,7 +102,7 @@ a:hover.more{ color:#64bdd9;} .btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;} .btn_free:hover{ background:#d63502;} /*成员邀请*/ -.invi_search{ width:230px; margin:0 auto;} +.invi_search{ width:295px; margin:0 auto;} .invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;} .invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} .invi_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;}