From d390c84de0831414b187820d6c14d6b2312e4308 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 6 Mar 2015 15:29:05 +0800 Subject: [PATCH 01/15] Signed-off-by: alan <547533434@qq.com> --- db/schema.rb | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 4a3b14edc..b863dbaed 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150302091345) do +ActiveRecord::Schema.define(:version => 20150305011359) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -631,16 +631,6 @@ ActiveRecord::Schema.define(:version => 20150302091345) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_details_copy", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -825,6 +815,13 @@ ActiveRecord::Schema.define(:version => 20150302091345) do t.integer "project_id" end + create_table "organizations", :force => true do |t| + t.string "name" + t.string "logo_link" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "poll_answers", :force => true do |t| t.integer "poll_question_id" t.text "answer_text" @@ -949,6 +946,7 @@ ActiveRecord::Schema.define(:version => 20150302091345) do t.integer "user_id" t.integer "dts_test", :default => 0 t.string "enterprise_name" + t.integer "organization_id" end add_index "projects", ["lft"], :name => "index_projects_on_lft" @@ -1036,12 +1034,12 @@ ActiveRecord::Schema.define(:version => 20150302091345) do end create_table "roles", :force => true do |t| - t.string "name", :limit => 90 - t.integer "position" - t.boolean "assignable" - t.integer "builtin" + t.string "name", :limit => 30, :default => "", :null => false + t.integer "position", :default => 1 + t.boolean "assignable", :default => true + t.integer "builtin", :default => 0, :null => false t.text "permissions" - t.string "issues_visibility", :limit => 90 + t.string "issues_visibility", :limit => 30, :default => "default", :null => false end create_table "schools", :force => true do |t| From f50ea0f78046d53107d3607427f4bdbd3f739e29 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 6 Mar 2015 16:36:12 +0800 Subject: [PATCH 02/15] Signed-off-by: alan <547533434@qq.com> --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3f07ad408..299af4509 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'spreadsheet' gem 'ruby-ole' #gem 'email_verifier', path: 'lib/email_verifier' gem 'rufus-scheduler' -gem 'dalli', path: 'lib/dalli-2.7.2' +#gem 'dalli', path: 'lib/dalli-2.7.2' group :development do gem 'grape-swagger' gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git' From b3cbfd39cabb8e43cb05b790f72b8980befde94b Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 7 Mar 2015 01:07:50 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=8C=E5=88=A0=E6=8E=89=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_newfile_index.html.erb | 250 ---------------------- app/views/files/index.html.erb | 250 +++++++++++++++++++++- app/views/files/index.js.erb | 2 - app/views/issues/_newissue_index.html.erb | 6 +- app/views/issues/show.html.erb | 2 +- app/views/layouts/base_projects.html.erb | 12 +- app/views/memos/new.html.erb | 4 +- app/views/projects/show.html.erb | 9 +- app/views/projects/show.js.erb | 1 - app/views/tags/_project_tag.html.erb | 4 +- 10 files changed, 272 insertions(+), 268 deletions(-) delete mode 100644 app/views/files/_newfile_index.html.erb delete mode 100644 app/views/files/index.js.erb delete mode 100644 app/views/projects/show.js.erb diff --git a/app/views/files/_newfile_index.html.erb b/app/views/files/_newfile_index.html.erb deleted file mode 100644 index 5ffaacae4..000000000 --- a/app/views/files/_newfile_index.html.erb +++ /dev/null @@ -1,250 +0,0 @@ - -
- <% if @isproject %> - <%= render :partial => 'project_file', locals: {project: @project} %> - <% else %> - <%= render :partial => 'course_file', locals: {course: @course} %> - <% end %> -
- - - - - diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 39bc8b52e..4b6df47cb 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -1 +1,249 @@ -<%= render :partial => 'files/newfile_index' %> \ No newline at end of file +
+ <% if @isproject %> + <%= render :partial => 'project_file', locals: {project: @project} %> + <% else %> + <%= render :partial => 'course_file', locals: {course: @course} %> + <% end %> +
+ + + + + diff --git a/app/views/files/index.js.erb b/app/views/files/index.js.erb deleted file mode 100644 index 59bc2407f..000000000 --- a/app/views/files/index.js.erb +++ /dev/null @@ -1,2 +0,0 @@ -alert("eeee"); -$('#content').html('<%= escape_javascript(render :partial => 'issues/newissue_index') %>'); diff --git a/app/views/issues/_newissue_index.html.erb b/app/views/issues/_newissue_index.html.erb index f0b7c0108..b89ba41a2 100644 --- a/app/views/issues/_newissue_index.html.erb +++ b/app/views/issues/_newissue_index.html.erb @@ -4,13 +4,15 @@
<% if @project.enabled_modules.where("name = 'issue_tracking'").count > 0 %> - <%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new, + <% if User.current.member_of?(@project) %> + <%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new, :html => {:accesskey => Redmine::AccessKeys.key_for(:new_issue)}, :class => 'icon icon-add' %> + <% end %> <%= link_to l(:label_query), '#', :class => 'icon icon-help', :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %> <% end %> - 问题总数：100 未解决：20 + 问题总数：<%= @project.issues.count %> 未解决：<%= @project.issues.where('status_id in (1,2,4,6)').count %>
<% if !@query.new_record? && @query.editable_by?(User.current) %> diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index fb8296f64..69abf79a6 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,5 +1,5 @@
-

问题跟踪

+

<%= l(:label_issue_plural) %>

<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> <% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 2bc86d1ca..f7e4a2132 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -103,7 +103,11 @@
-
私有
+
私有 + <% end %> +
<% if @project.project_type == 0 %> @@ -129,9 +133,7 @@
  • 邀请Trustie注册用户
    • - <%= link_to "动态", {:controller => 'projects', :action => 'show', :id => @project.id}, - :remote => "true", - :style => "color:#3CA5C6" %> + <%= link_to "动态", {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
    <%= link_to "问题跟踪", project_issues_path(@project), :style => "color:#3CA5C6" %>(<%= @project.issues.count %>) @@ -144,7 +146,7 @@ <%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %> (<%= @project.boards.first.topics.count %>) <% if User.current.logged? && User.current.member_of?(@project) %> - <%= link_to "+发贴", new_board_message_path(@project.boards.first, @project), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> + <%= link_to "+发贴", new_board_message_path(@project.boards.first), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> <% end %>
    diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb index 03a60044a..8bcb77a57 100644 --- a/app/views/memos/new.html.erb +++ b/app/views/memos/new.html.erb @@ -5,7 +5,7 @@ <% @nav_dispaly_forum_label = 1%> <%= javascript_include_tag "ckeditor/ckeditor.js" %> -
    +
    @@ -19,7 +19,7 @@ -
    软件项目托管社区<%= link_to request.host()+"/forums", forums_path %>

    <%=link_to l(:label_home),home_path %> > <%=link_to '公共贴吧', :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name %>
    +

    <%=l(:label_memo_new)%>

    diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 15c1338a2..0e4aca073 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,3 +1,6 @@ +
    +

    <%= l(:label_activity) %>

    +
    <%= javascript_include_tag "jquery.infinitescroll.js" %> \ 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;} From 5ff43fdea762d99ddaab16f359abdb98599f988f Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Sat, 7 Mar 2015 10:52:20 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20Signed-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 12 +- app/views/layouts/base_projects.html.erb | 2 +- .../projects/_invite_members_by_mail.html.erb | 21 + app/views/projects/invite_members.html.erb | 132 +++---- .../projects/invite_members_by_mail.html.erb | 2 + .../projects/invite_members_by_mail.js.erb | 10 + app/views/projects/show.html.erb | 362 +++++++++--------- app/views/tags/_project_tag.html.erb | 40 +- config/routes.rb | 2 + db/schema.rb | 19 +- public/stylesheets/project.css | 182 +++++++++ 11 files changed, 502 insertions(+), 282 deletions(-) create mode 100644 app/views/projects/_invite_members_by_mail.html.erb create mode 100644 app/views/projects/invite_members_by_mail.html.erb create mode 100644 app/views/projects/invite_members_by_mail.js.erb create mode 100644 public/stylesheets/project.css diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 7e549509b..1428b4997 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -332,10 +332,18 @@ class ProjectsController < ApplicationController @wiki ||= @project.wiki end - + def send_mail_to_member + unless params[:mail].nil? + email = params[:mail] + Mailer.send_invite_in_project(email, @project, User.current).deliver + end + end #发送邮件邀请新用户 def invite_members_by_mail - + respond_to do |format| + format.html + format.js + end end # 邀请Trustie注册用户 diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 40f13a2f8..de85e7257 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -129,7 +129,7 @@
    邀请
      -
    • <%= link_to "发送邮件邀请新用户" %>
      • +
    • <%= link_to "发送邮件邀请新用户", :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %>
    • <%= link_to "邀请Trustie注册用户", :controller=>"projects", :action=>"invite_members", :id => @project %>
    diff --git a/app/views/projects/_invite_members_by_mail.html.erb b/app/views/projects/_invite_members_by_mail.html.erb new file mode 100644 index 000000000..68ab6fae4 --- /dev/null +++ b/app/views/projects/_invite_members_by_mail.html.erb @@ -0,0 +1,21 @@ +
    +
    +
    +
    +

    发送邮件邀请新用户

    +

    输入好友邮箱地址，Trustie帮您免费发送！

    + <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %> +
      +
    • + <%= text_field_tag 'mail', '邮箱', :class => "fb_item fl" %> +
      • +
      + +
      +
    + <%= submit_tag '免费发送', :class=> "btn_free" %> + + <% end %> +
    + +
    \ No newline at end of file diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb index 052ee92ef..e57696fc3 100644 --- a/app/views/projects/invite_members.html.erb +++ b/app/views/projects/invite_members.html.erb @@ -1,67 +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/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb new file mode 100644 index 000000000..c38aec404 --- /dev/null +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -0,0 +1,2 @@ +<%= stylesheet_link_tag 'project', :media => 'all' %> +<%= render :partial => "invite_members_by_mail"%> \ No newline at end of file diff --git a/app/views/projects/invite_members_by_mail.js.erb b/app/views/projects/invite_members_by_mail.js.erb new file mode 100644 index 000000000..8edaf7210 --- /dev/null +++ b/app/views/projects/invite_members_by_mail.js.erb @@ -0,0 +1,10 @@ +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'invite_members_by_mail') %>'); +showModal('ajax-modal', '513px'); +$('#ajax-modal').css('height','569px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + + ""); +$('#ajax-modal').parent().removeClass("alert_praise"); +$('#ajax-modal').parent().css("top","").css("left",""); +$('#ajax-modal').parent().addClass("alert_box"); + diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 0e4aca073..6a47f07f0 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,182 +1,182 @@ -
    -

    <%= l(:label_activity) %>

    -
    -<%= javascript_include_tag "jquery.infinitescroll.js" %> - -
    -
    - <% unless @events_pages.empty? %> - <% @events_pages.each do |e| -%> - <% act = e.forge_act %> - <% if e.forge_act_type == "Issue" %> -
    -
    - <%= image_tag(url_to_avatar(act.author), :class => "avatar") %> -
    - -
    - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - - <%= link_to_user(act.author) %> - <%= l(:label_new_activity) %> - - <%= link_to format_activity_title("#{act.source_from}##{act.project_issues_index} (#{act.status}): #{act.tracker.name} #{act.subject}"), - {:controller => 'issues', - :action => 'show', - :id => act.id} %> -
    - <%= textAreailizable act,:description %> -
    -
    - <%= l :label_activity_time %> - ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> -
    - <%= link_to l(:label_find_all_comments), issue_path(act.id) %> <%= l(:label_comments_count, :count => act.journals.count) %> -
    -
    -
    -
    - <% elsif e.forge_act_type == "Journal" %> -
    -
    - <%= image_tag(url_to_avatar(e.user), :class => "avatar") %> -
    - -
    - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - - <%= link_to(h(e.user), user_path(e.user_id)) %> - <%= l(:label_new_activity) %> - - <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> - <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"), - {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> -
    - <%= textAreailizable act,:notes %> -
    -
    - <%= l :label_activity_time %> - ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> -
    -
    -
    - <% elsif e.forge_act_type == "Message" %> -
    -
    - <%= image_tag(url_to_avatar(e.user), :class => "avatar") %> -
    -
    - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - - <%= link_to(h(e.user), user_path(e.user_id)) %> - <%= l(:label_new_activity) %> - - <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), - {:controller => 'messages', - :action => 'show', - :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> -
    - <%= textAreailizable act,:content %> -
    -
    - <%= l :label_activity_time %> - ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> -
    -
    -
    - <% elsif e.forge_act_type == "News" %> -
    -
    - <%= image_tag(url_to_avatar(e.user), :class => "avatar") %> -
    -
    - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - - <%= link_to(h(e.user), user_path(e.user_id)) %> - <%= l(:label_new_activity) %> - - <% unless act.nil? %> - <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> - <% end %> -
    - <%= textAreailizable act,:description %> -
    -
    - <%= l :label_activity_time %> - ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> -
    - - <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %> - - - <%= l(:label_comments_count, :count => act.comments_count) %> - -
    -
    -
    -
    - <% elsif e.forge_act_type == "Document" %> -
    -
    - <%= image_tag(url_to_avatar(e.user), :class => "avatar") %> -
    -
    - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - - <%= link_to(h(e.user), user_path(e.user_id)) %> - <%= l(:label_new_activity) %> - - <%= link_to format_activity_title("#{l(:label_document)}: #{act.title}"), {:controller => 'documents', :action => 'show', :id => act.id} %> -
    - <%= textAreailizable act,:description %> -
    -
    - <%= l :label_activity_time %> - ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> - -
    -
    -
    - <% elsif e.forge_act_type == "Attachment" %> -
    -
    - <%= image_tag(url_to_avatar(e.user), :class => "avatar") %> -
    -
    - <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - - <%= link_to(h(e.user), user_path(e.user_id)) %> - <%= l(:label_new_activity) %> - - <%= link_to format_activity_title("#{l(:label_attachment)}: #{act.filename}"), {:controller => 'attachments', :action => 'show', :id => act.id} %> -
    - <%= textAreailizable act,:description %> -
    -
    - <%= l :label_activity_time %> - ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> - -
    -
    -
    - <% end %> - <% end %> - <% end %> -
    -
    - +
    +

    <%= l(:label_activity) %>

    +
    +<%= javascript_include_tag "jquery.infinitescroll.js" %> + +
    +
    + <% unless @events_pages.empty? %> + <% @events_pages.each do |e| -%> + <% act = e.forge_act %> + <% if e.forge_act_type == "Issue" %> +
    +
    + <%= image_tag(url_to_avatar(act.author), :class => "avatar") %> +
    + +
    + <%= h(e.project) if @project.nil? || @project.id != e.project_id %> + + <%= link_to_user(act.author) %> + <%= l(:label_new_activity) %> + + <%= link_to format_activity_title("#{act.source_from}##{act.project_issues_index} (#{act.status}): #{act.tracker.name} #{act.subject}"), + {:controller => 'issues', + :action => 'show', + :id => act.id} %> +
    + <%= textAreailizable act,:description %> +
    +
    + <%= l :label_activity_time %> + ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> +
    + <%= link_to l(:label_find_all_comments), issue_path(act.id) %> <%= l(:label_comments_count, :count => act.journals.count) %> +
    +
    +
    +
    + <% elsif e.forge_act_type == "Journal" %> +
    +
    + <%= image_tag(url_to_avatar(e.user), :class => "avatar") %> +
    + +
    + <%= h(e.project) if @project.nil? || @project.id != e.project_id %> + + <%= link_to(h(e.user), user_path(e.user_id)) %> + <%= l(:label_new_activity) %> + + <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> + <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"), + {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> +
    + <%= textAreailizable act,:notes %> +
    +
    + <%= l :label_activity_time %> + ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> +
    +
    +
    + <% elsif e.forge_act_type == "Message" %> +
    +
    + <%= image_tag(url_to_avatar(e.user), :class => "avatar") %> +
    +
    + <%= h(e.project) if @project.nil? || @project.id != e.project_id %> + + <%= link_to(h(e.user), user_path(e.user_id)) %> + <%= l(:label_new_activity) %> + + <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), + {:controller => 'messages', + :action => 'show', + :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> +
    + <%= textAreailizable act,:content %> +
    +
    + <%= l :label_activity_time %> + ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> +
    +
    +
    + <% elsif e.forge_act_type == "News" %> +
    +
    + <%= image_tag(url_to_avatar(e.user), :class => "avatar") %> +
    +
    + <%= h(e.project) if @project.nil? || @project.id != e.project_id %> + + <%= link_to(h(e.user), user_path(e.user_id)) %> + <%= l(:label_new_activity) %> + + <% unless act.nil? %> + <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> + <% end %> +
    + <%= textAreailizable act,:description %> +
    +
    + <%= l :label_activity_time %> + ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> +
    + + <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %> + + + <%= l(:label_comments_count, :count => act.comments_count) %> + +
    +
    +
    +
    + <% elsif e.forge_act_type == "Document" %> +
    +
    + <%= image_tag(url_to_avatar(e.user), :class => "avatar") %> +
    +
    + <%= h(e.project) if @project.nil? || @project.id != e.project_id %> + + <%= link_to(h(e.user), user_path(e.user_id)) %> + <%= l(:label_new_activity) %> + + <%= link_to format_activity_title("#{l(:label_document)}: #{act.title}"), {:controller => 'documents', :action => 'show', :id => act.id} %> +
    + <%= textAreailizable act,:description %> +
    +
    + <%= l :label_activity_time %> + ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> + +
    +
    +
    + <% elsif e.forge_act_type == "Attachment" %> +
    +
    + <%= image_tag(url_to_avatar(e.user), :class => "avatar") %> +
    +
    + <%= h(e.project) if @project.nil? || @project.id != e.project_id %> + + <%= link_to(h(e.user), user_path(e.user_id)) %> + <%= l(:label_new_activity) %> + + <%= link_to format_activity_title("#{l(:label_attachment)}: #{act.filename}"), {:controller => 'attachments', :action => 'show', :id => act.id} %> +
    + <%= textAreailizable act,:description %> +
    +
    + <%= l :label_activity_time %> + ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %> + +
    +
    +
    + <% end %> + <% end %> + <% end %> +
    +
    + <%= paginate @events_pages %> \ No newline at end of file diff --git a/app/views/tags/_project_tag.html.erb b/app/views/tags/_project_tag.html.erb index acb6bb41e..1f91c984e 100644 --- a/app/views/tags/_project_tag.html.erb +++ b/app/views/tags/_project_tag.html.erb @@ -1,20 +1,20 @@ -
    - <%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %> -
    -<% if User.current.logged? %> - <%= toggle_link ("+ 添加标签"), 'put-tag-form', {:focus => 'tags_name'} %> -<% end %> - - +
    + <%= render :partial => "tags/tag_name",:locals => {:obj => obj,:non_list_all => false ,:object_flag => object_flag} %> +
    +<% if User.current.logged? %> + <%= toggle_link ("+ 添加标签"), 'put-tag-form', {:focus => 'tags_name'} %> +<% end %> + + diff --git a/config/routes.rb b/config/routes.rb index f61253e5e..cc64781f9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -369,6 +369,8 @@ RedmineApp::Application.routes.draw do get 'feedback', :action => 'feedback', :as => 'project_feedback' get 'watcherlist', :action=> 'watcherlist' get 'invite_members', :action=> 'invite_members' + get 'invite_members_by_mail', :action=> 'invite_members_by_mail' + get 'send_mail_to_member', :action => 'send_mail_to_member' 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/db/schema.rb b/db/schema.rb index f4e6b09c7..bad1cf2ae 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,11 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -<<<<<<< HEAD ActiveRecord::Schema.define(:version => 20150305081132) do -======= -ActiveRecord::Schema.define(:version => 20150305011359) do ->>>>>>> 001b8bb1120fadea713d280e7d5bbabf7f5e57b8 create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -819,19 +815,18 @@ ActiveRecord::Schema.define(:version => 20150305011359) do t.integer "project_id" end -<<<<<<< HEAD - create_table "phone_app_versions", :force => true do |t| - t.string "version" - t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false -======= create_table "organizations", :force => true do |t| t.string "name" t.string "logo_link" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false ->>>>>>> 001b8bb1120fadea713d280e7d5bbabf7f5e57b8 + end + + create_table "phone_app_versions", :force => true do |t| + t.string "version" + t.text "description" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "poll_answers", :force => true do |t| diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css new file mode 100644 index 000000000..2f249f4aa --- /dev/null +++ b/public/stylesheets/project.css @@ -0,0 +1,182 @@ +@charset "utf-8"; +/* CSS Document */ +body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#eaebec; font-style:normal;} +div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ margin:0; padding:0;} +div,img,tr,td,table{ border:0;} +table,tr,td{border:0;cellspacing:0; cellpadding:0;} +ol,ul,li{ list-style-type:none} +.cl{ clear:both; overflow:hidden; } +a{ text-decoration:none; cursor:pointer;} +.ml10{ margin-left:10px;} +.ml20{ margin-left:20px;} +.mr10{ margin-right:10px;} +.mb5{ margin-bottom:5px;} +.mb10{ margin-bottom:10px;} +.fl{ float: left;} +.fr{ float:right;} +.project_h4{ font-size:14px; color:#3b3b3b;} + + +.project_content{ width:940px; margin:10px auto;} +.project_left{ float:left;} +.project_right{ width:670px; float:left;background:#fff; padding:10px;} +/*项目信息*/ +.project_info{ background:#fff; padding:10px;width:222px; padding-right:8px;} +.pr_info_id{ width:137px; color:#5a5a5a; font-size:14px;} +.pr_info_join{} +.pr_info_join a{ color:#fff; display:block; padding:0 5px; margin-right:10px; float:left; height:22px; background:#64bdd9; text-align:center; } +.pr_info_join a:hover{ background:#41a8c8;} +a.pr_info_name{ color:#3e4040; font-size:14px; line-height:1.5;} +a:hover.pr_info_name{ color:#3ca5c6;} +.pr_info_score{ font-size:14px; color:#3e4040; } +.pr_info_score a{ color:#ff7143;} +.pr_info_score a:hover{ color:#64bdd9;} +.img_private{ background:url(../images/img_project.png) 0 0 no-repeat; width:32px; height:16px; color:#fff; font-size:12px; padding-left:7px; } +a.info_foot_num{ font-weight: bold; color:#3ca5c6; } +.pr_info_foot{ color:#7f7f7f; margin-top:5px; } +a:hover.info_foot_num{ color:#2390b2;} + +/*左侧导航*/ +.subNavBox{width:240px; background:#fff;margin:10px 10px 0 0;} +.subNav{border-bottom:solid 1px #e5e3da;cursor:pointer;font-weight:bold;font-size:14px;color:#3ca5c6;line-height:28px;padding-left:10px;background-color:#fff;} +.subNav_jiantou{background:url(../images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;} +.subNav_jiantou:hover{color:#0781b4; } +.currentDd{color:#0781b4; } +.currentDt{background-color:#fff; } +.navContent{display: none;border-bottom:solid 1px #e5e3da; } +.navContent li a{display:block;width:240px;heigh:28px;text-align:center;font-size:12px;line-height:28px;color:#333} +.navContent li a:hover{color:#fff;background-color:#b3e0ee} +.subnav_num{ font-weight:normal; color:#ff7143; font-size:12px;} +a.subnav_green{ background:#28be6c; color:#fff; font-size:12px; font-weight:normal;height:20px; padding:0px 5px; text-align:center; margin-top:5px; margin-left:82px;} +a.ml95{ margin-left:97px;} +a.ml105{ margin-left:120px;} +a:hover.subnav_green{ background:#14ad5a;} + +/*简介*/ +.project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d;} +.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;} +.lg-foot:hover{ color:#787b7e;} +/****标签(和资源库的tag样式一致)***/ +.project_Label{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px;} +a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} +.submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } +.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} +.re_tag{ width: auto; padding:0 5px; height:22px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; } +.re_tag a{ color:#0d90c3;} +.tag_h span,.tag_h a{ margin-bottom:5px;} +/*右侧内容--动态*/ +.project_r_h{ width:670px; height:40px; background:#eaeaea;} +.project_h2{ background:#64bdd9; color:#fff; height:37px; width:90px; text-align:center; font-weight:normal; padding-top:3px; font-size:16px;} +.project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;} +.project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;} +a.more{ float:right; font-size:12px; font-weight:normal; color:#a9a9a9; margin-top:3px;} +a:hover.more{ color:#64bdd9;} +.project_box_ul{ padding:0 10px;} +.project_box_list{ padding:10px 0; border-bottom:1px dashed #e2e1e1; padding-left:30px; color:#6f6c6c;} +.img_problem{ background:url(../images/img_project.png) 0 -20px no-repeat;} +.img_talk{ background:url(../images/img_project.png) 0 -62px no-repeat;} +.img_ziyuan{ background:url(../images/img_project.png) 0 -115px no-repeat;} +.img_edition{ background:url(../images/img_project.png) 0 -167px no-repeat;} +.project_name{ color:#058c42;} +.project_name:hover{ color:#016f33;} +.project_txt{ color:#0781b4; width:445px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +.project_txt02{ color:#0781b4; width:618px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +.project_txt:hover{ color:#066e9a;} +.noline{ border-bottom:none;} + +/*弹框*/ +.floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;} +.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;} +.box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} +/*邮件邀请*/ +.box_main{ width:345px; margin:0 auto;} +.box_h3{ color:#15bccf; text-align:center; font-size:16px;} +.box_p{ color:#404040; margin-bottom:5px;} +.fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;} +.icon_addm{ background:url(../images/img_floatbox.png) 0 -33px no-repeat; width:16px; height:16px; display:block; margin:5px 0 0 5px;} +.icon_addm:hover{background:url(../images/img_floatbox.png) 0 -61px no-repeat; } +.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px no-repeat;width:16px; height:16px; display:block; margin:5px 0 0 5px} +.icon_removem:hover{background:url(../images/img_floatbox.png) -22px -61px no-repeat;} +.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_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;} +/*问题跟踪*/ +.problem_top{ margin:10px 0 ;} +.problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;} +.problem_search_btn{ background:#64bdd9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;} +.problem_search_btn:hover{ background:#3da1c1; border:1px solid #3da1c1;} +.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; width:60px; height:22px; font-size:12px; text-align:center; padding-top:2px;} +.problem_new_btn:hover{ background:#ff7143; color:#fff;} +.problem_p{ color:#535252; margin-top:5px;} +.problem_p span{ color:#ff3e00;} +.problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3; margin-top:5px;} +.problem_pic:hover{border:1px solid #64bdd9;} +.problem_txt{ width:610px; margin-left:10px; color:#777777;} +.problem_name{ color:#ff5722;} +.problem_name:hover{ color:#d33503;} +.problem_tit{ color:#0781b4; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +.problem_tit:hover{ color:#09658c; } +.problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;} +/****翻页***/ +.wlist{} +.wlist a{ float:right; border:1px solid #64bdd9; padding:0 5px; margin-left:3px; color:#64bdd9;} +.wlist a:hover{border:1px solid #64bdd9; background-color:#64bdd9; color:#fff; text-decoration:none;} +.wlist_select a { background-color:#48aac9; color:#fff;} +/****讨论区***/ +.talk_top{ margin:10px 0; font-size:14px; color:#4c4c4c;} +.talk_top span{ color:#ff7143;} +.talk_txt{ width:460px; margin-left:10px; color:#676868;} +.talk_up{ color:#f63c00;} +.talk_pic{width:32px; height:32px; padding:2px;} +.talk_btn{ background:#64bdd9; width:50px; height:22px; color:#fff; text-align:center; margin-top:12px; padding-top:2px;} +.talk_btn:hover{ background:#2a9dc1;} +/****讨论区内页***/ +.mt0{ margin-top:0px;} +.talk_info{ color:#7d7d7d; margin-left:50px; margin-top:10px;} +.talk_edit{ color:#426e9a; margin-right:5px;} +.talk_edit:hover{ color:#ff5722;} +.talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;} +.talk_text{ border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px;} +/****资源库***/ +.f_l{ float:left;} +.f_r{ float:right;} +.resource a{ text-align:center;} +.b_lblue{ background:#64bdd9;} +.b_dblue{ background:#55a1b9; cursor:pointer;} +.f_b{ font-weight: bold;} +.c_blue{ color:#64bdd9;} +.c_grey{ color:#999999;} +.c_grey02{ color:#666666;} +.f_14{ font-size:14px;} +.c_dblue{ color:#3e6d8e;} +.w90{width:90px;} +.ml10{margin-left:10px;} +.resource{ width:670px;} +.re_top{width:660px; height:40px; background:#eaeaea; padding:5px;} +.re_top input{ float:left;} +.re_search{ margin-top:7px; margin-left:5px;} +.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;} +.re_schbtn{ width:60px; height:26px; color:#fff; margin-right:5px; border:none; margin-left:0px; } +a.re_fabu { display:block; width:90px; height:35px; font-size:14px; color:#fff; text-align:center; padding-top:5px; } +a:hover.re_fabu{background:#55a1b9;} +.re_con{ margin:5px; width:665px;} +.re_con_top{color:#494949; } +.re_con_top span{ color:#999999; font-weight:bold;} +a.re_select{ display:block; width:88px; height:22px; border:1px solid #ff9900; color:#ff9900; margin-left:10px;} +a:hover.re_select{ background:#ff9900; color:#fff; text-decoration:none;} +.re_open{display:block; width:46px; height:22px; border:1px solid #64bdd9; color:#64bdd9; margin-left:10px;} +a:hover.re_open{ background:#64bdd9; color:#fff; text-decoration:none;} +a.re_de{ color:#6883b6; margin-left:15px;} +.re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;} +/****资源库***/ +.setting{ background:url(../images/setting.jpg) 0 0 no-repeat; width:670px; height:443px;} + + + + + + From b043d07d61f41cac581b1b63e66a5baec473891c Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 7 Mar 2015 11:02:12 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=96=B0=E8=B4=B4=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/boards/_project_show.html.erb | 5 ++--- app/views/layouts/base_projects.html.erb | 2 ++ public/stylesheets/application.css | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index 97ed903d9..25903f588 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -9,9 +9,8 @@