From bb94a41435db111385804b6786e86d0c00baa7da Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Mon, 21 Dec 2015 15:11:41 +0800 Subject: [PATCH 001/230] =?UTF-8?q?=E7=BA=A2=E7=82=B9=E4=B8=AD=E5=8C=85?= =?UTF-8?q?=E5=90=ABat=E7=9A=84=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 2714117e9..aa048888c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -344,7 +344,8 @@ class User < Principal user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count user_memo_count = MemoMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count system_messages_count = SystemMessage.where("created_at >?", User.current.onclick_time.onclick_time).count - messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count = AtMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count + messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count end # 查询指派给我的缺陷记录 From 8cdd7c58cf945786a367c28cfed01985c94981d7 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Mon, 21 Dec 2015 15:14:51 +0800 Subject: [PATCH 002/230] =?UTF-8?q?at=E5=90=8D=E5=8D=95=E5=8A=A0=E5=AE=BD?= =?UTF-8?q?=E4=B8=80=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/at/jquery.atwho.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/kindeditor/at/jquery.atwho.css b/public/assets/kindeditor/at/jquery.atwho.css index 9a4c21d9b..df3ff9d94 100644 --- a/public/assets/kindeditor/at/jquery.atwho.css +++ b/public/assets/kindeditor/at/jquery.atwho.css @@ -9,7 +9,7 @@ border: 1px solid #DDD; border-radius: 3px; box-shadow: 0 0 5px rgba(0,0,0,0.1); - min-width: 120px; + min-width: 200px; max-height: 200px; overflow: auto; z-index: 11110 !important; From b235e8de70a3aded02a09ca1338bb2fdbaf6bfa2 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Mon, 21 Dec 2015 15:15:39 +0800 Subject: [PATCH 003/230] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/configuration.yml.example | 73 ++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/config/configuration.yml.example b/config/configuration.yml.example index 27eb86f68..880c613e9 100644 --- a/config/configuration.yml.example +++ b/config/configuration.yml.example @@ -23,7 +23,7 @@ # email_delivery: # delivery_method: :smtp # smtp_settings: -# address: "localhost" +# address: smtp.163.com # port: 25 # # ==== SMTP server at example.com using LOGIN authentication and checking HELO for foo.com @@ -32,12 +32,12 @@ # email_delivery: # delivery_method: :smtp # smtp_settings: -# address: "example.com" -# port: 25 +# address: smtp.gmail.com +# port: 587 # authentication: :login # domain: 'foo.com' -# user_name: 'myaccount' -# password: 'password' +# user_name: senluowanxiangt@gmail.com +# password: 1913TXBja # # ==== SMTP server at example.com using PLAIN authentication # @@ -45,12 +45,12 @@ # email_delivery: # delivery_method: :smtp # smtp_settings: -# address: "example.com" -# port: 25 +# address: smtp.gmail.com +# port: 587 # authentication: :plain # domain: 'example.com' -# user_name: 'myaccount' -# password: 'password' +# user_name: senluowanxiangt@gmail.com +# password: 1913TXBja # # ==== SMTP server at using TLS (GMail) # @@ -62,12 +62,12 @@ # delivery_method: :smtp # smtp_settings: # enable_starttls_auto: true -# address: "smtp.gmail.com" +# address: smtp.gmail.com # port: 587 # domain: "smtp.gmail.com" # 'your.domain.com' for GoogleApps # authentication: :plain -# user_name: "your_email@gmail.com" -# password: "your_password" +# user_name: senluowanxiangt@gmail.com +# password: 1913TXBja # # # === More configuration options @@ -78,18 +78,17 @@ # http://wiki.rubyonrails.org/rails/pages/HowToSendEmailsWithActionMailer -# default configuration options for all environments + default: - # Outgoing emails configuration (see examples above) email_delivery: delivery_method: :smtp smtp_settings: - address: smtp.example.net - port: 25 - domain: example.net - authentication: :login - user_name: "redmine@example.net" - password: "redmine" + address: mail.trustie.net + port: 25 + domain: mail.trustie.net + authentication: :login + user_name: "mail@trustie.net" + password: "loong2010" # Absolute path to the directory where attachments are stored. # The default is the 'files' directory in your Redmine instance. @@ -104,7 +103,7 @@ default: # autologin_cookie_name: the name of the cookie (default: autologin) # autologin_cookie_path: the cookie path (default: /) # autologin_cookie_secure: true sets the cookie secure flag (default: false) - autologin_cookie_name: + autologin_cookie_name: "autologin_trustie" autologin_cookie_path: autologin_cookie_secure: @@ -170,7 +169,7 @@ default: # Absolute path (e.g. /usr/bin/convert, c:/im/convert.exe) to # the ImageMagick's `convert` binary. Used to generate attachment thumbnails. - #imagemagick_convert_command: + imagemagick_convert_command: '/home/pdl/redmine-2.3.2-0/common/bin/convert' # Configuration of RMagcik font. # @@ -196,11 +195,41 @@ default: # Maximum number of simultaneous AJAX uploads #max_concurrent_ajax_uploads: 2 + #pic_types: "bmp,jpeg,jpg,png,gif" + + repository_root_path: '/tmp/htdocs' + judge_server: 'http://judge.trustie.net/' + + # Git's url + gitlab_address: 'http://gitfast.trustie.net' # specific configuration options for production environment # that overrides the default ones production: + # CJK support + rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf + judge_server: 'http://192.168.80.21:8080/' + repository_root_path: '/home/pdl/redmine-2.3.2-0/apache2/htdocs' + cookie_domain: ".trustie.net" + email_delivery: + delivery_method: :smtp + smtp_settings: + address: mail.trustie.net + port: 25 + domain: mail.trustie.net + authentication: :login + user_name: "mail@trustie.net" + password: "loong2010" # specific configuration options for development environment # that overrides the default ones development: + email_delivery: + delivery_method: :smtp + smtp_settings: + address: mail.trustie.net + port: 25 + domain: mail.trustie.net + authentication: :login + user_name: "mail@trustie.net" + password: "loong2010" From 4111cb53dcd1fb9a1192c1a6a2234ef202400274 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Dec 2015 17:13:13 +0800 Subject: [PATCH 004/230] =?UTF-8?q?=E8=A7=A3=E5=86=B3fork=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=A1=B9=E7=9B=AE404=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index e939511b6..1674055ac 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -31,8 +31,8 @@ class RepositoriesController < ApplicationController default_search_scope :changesets before_filter :find_project_by_project_id, :only => [:new, :create, :newrepo] - before_filter :find_repository, :only => [:edit, :update, :destroy, :committers, :forked] - before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo,:to_gitlab] + before_filter :find_repository, :only => [:edit, :update, :destroy, :committers] + before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked] before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue] before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked] accept_rss_auth :revisions @@ -64,6 +64,8 @@ class RepositoriesController < ApplicationController end def forked + @project = Project.find(params[:id]) + @repository = Repository.where("project_id =? and type =?", @project.id, "Repository::Gitlab") # 如果当前用户已经fork过该项目，不会新fork项目，则跳至已fork的项 unless has_forked?(@project, User.current) project = project_from_current_project(@project.id, User.current.id) @@ -76,7 +78,11 @@ class RepositoriesController < ApplicationController else g = Gitlab.client if User.current.gid.nil? - g.sync_user(User.current) + begin + g.sync_user(User.current) + ensure + logger.error "Synv user failed ==>#{User.current.id}" + end end gproject = g.fork(@project.gpid, User.current.gid) if gproject From 0e68266f4915c0ee0826c718849d84121c1b391e Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 22 Dec 2015 10:59:09 +0800 Subject: [PATCH 005/230] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/show.html.erb | 2 +- public/stylesheets/repository.css | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index e5f331d6c..afe4740eb 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -41,7 +41,7 @@
<%= @changesets_latest_coimmit.message %>
<% else %> -
<%=@changesets_latest_coimmit.author_email %>
+
<%=@changesets_latest_coimmit.author_email %>
提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
<%= @changesets_latest_coimmit.message %>
 diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css index 2e084d61c..baf57c4b1 100644 --- a/public/stylesheets/repository.css +++ b/public/stylesheets/repository.css @@ -286,4 +286,5 @@ li.commit .commit-row-info .committed_ago { } .rep_history_grey{ color: #7F7F7F; -} \ No newline at end of file +} +.rep_mail_name{max-width: 150px; overflow: hidden; text-overflow: ellipsis;} \ No newline at end of file From 22d8fc9abd7c4d5d3138593ce4bbc851c184ab14 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 22 Dec 2015 15:45:17 +0800 Subject: [PATCH 006/230] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=B9=B1=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/zipdown_controller.rb | 21 +++++++++++++++++---- public/javascripts/application.js | 27 ++++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb index 1a01ac97b..2a4430935 100644 --- a/app/controllers/zipdown_controller.rb +++ b/app/controllers/zipdown_controller.rb @@ -1,4 +1,8 @@ -require 'zip' +#coding=utf-8 + +require "base64" +require 'zip' + class ZipdownController < ApplicationController #查找项目（课程） before_filter :find_project_by_bid_id, :only => [:assort] @@ -11,7 +15,12 @@ class ZipdownController < ApplicationController def download if User.current.logged? begin - send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file]) + if params[:base64file] + file = Base64.decode64(params[:base64file]) + send_file "#{OUTPUT_FOLDER}/#{file}", :filename => filename_for_content_disposition(file), :type => detect_content_type(file) + else + send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => filename_for_content_disposition(params[:filename]), :type => detect_content_type(params[:file]) + end rescue => e render file: 'public/no_file_found.html' end @@ -107,7 +116,9 @@ class ZipdownController < ApplicationController bid_homework_path, OUTPUT_FOLDER) } [{files:[out_file.file_path], count: 1, index: 1, - real_file: out_file.file_path, file: File.basename(out_file.file_path), + real_file: out_file.file_path, + file: File.basename(out_file.file_path), + base64file: Base64.encode64(File.basename(out_file.file_path)), size:(out_file.pack_size / 1024.0 / 1024.0).round(2) }] end @@ -129,7 +140,9 @@ class ZipdownController < ApplicationController bid_homework_path, OUTPUT_FOLDER) } [{files:[out_file.file_path], count: 1, index: 1, - real_file: out_file.file_path, file: File.basename(out_file.file_path), + real_file: out_file.file_path, + file: File.basename(out_file.file_path), + base64file: Base64.encode64(File.basename(out_file.file_path)), size:(out_file.pack_size / 1024.0 / 1024.0).round(2) }] end diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 901e302d3..0cbe647d6 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -870,7 +870,10 @@ function redo() { window.location.reload() } -function encodeHomeworkUrl(url){ +function encodeHomeworkUrl(url, is_base64){ + if(typeof is_base64 === 'boolean' && is_base64){ + return '/zipdown/download?base64file='+url; + } var file = encodeURI(url).replace(/\+/g, '%2B'); return '/zipdown/download?file='+file; } @@ -891,7 +894,10 @@ $(function(){ } if(res.length==1){ - location.href = encodeHomeworkUrl(res[0].file);return; + if(res[0].base64file){ + location.href = encodeHomeworkUrl(res[0].base64file, true);return; + } + location.href = encodeHomeworkUrl(res[0].file);return; } document.getElementById('light').style.display='block'; @@ -904,8 +910,12 @@ $(function(){ } else { des = '第'+res[i].index+'个学生的作品下载'; } - $('
  • '+(i+1)+'. '+des+'  （共'+res[i].size+'M）
    • ').appendTo($container); + if(res[i].base64file){ + $('
  • '+(i+1)+'. '+des+'  （共'+res[i].size+'M）
    • ').appendTo($container); + } else { + $('
  • '+(i+1)+'. '+des+'  （共'+res[i].size+'M）
    • ').appendTo($container); + } } } }); @@ -973,3 +983,14 @@ function showNormalImage(id) { } } + +$(function(){ + //at 加链接 + $("span.at").hover(function(){ + $(this).css('cursor', 'pointer'); + }); + $("span.at").live('click', function(){ + var userId = $(this).attr('data-user-id'); + $(window.location).attr('href', '/users/'+userId); + }); +}); \ No newline at end of file From 2220e0b7cc315aaab6c446c642bc42a010f4d0e7 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 22 Dec 2015 15:48:41 +0800 Subject: [PATCH 007/230] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B8=96=E5=AD=90-?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE=E5=85=B3=E8=81=94=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/boards_controller.rb | 14 ++++++++++++-- app/models/board.rb | 2 ++ app/models/org_subfield.rb | 2 ++ app/models/org_subfield_board.rb | 5 +++++ config/routes.rb | 1 + .../20151221023622_create_org_subfield_boards.rb | 13 +++++++++++++ ...072758_add_board_type_to_org_subfield_boards.rb | 5 +++++ db/schema.rb | 14 +++++++++++++- spec/factories/org_subfield_boards.rb | 6 ++++++ spec/models/org_subfield_boards_spec.rb | 5 +++++ 10 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 app/models/org_subfield_board.rb create mode 100644 db/migrate/20151221023622_create_org_subfield_boards.rb create mode 100644 db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb create mode 100644 spec/factories/org_subfield_boards.rb create mode 100644 spec/models/org_subfield_boards_spec.rb diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 0c3236d4e..291593fc5 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -18,8 +18,8 @@ class BoardsController < ApplicationController layout 'base_projects'#by young default_search_scope :messages - before_filter :find_project_by_project_id, :find_board_if_available - before_filter :authorize, :except => [:new, :show, :create, :index] + before_filter :find_project_by_project_id, :find_board_if_available, :except => [:join_to_org_subfields] + before_filter :authorize, :except => [:new, :show, :create, :index, :join_to_org_subfields] accept_rss_auth :index, :show @@ -225,6 +225,16 @@ class BoardsController < ApplicationController redirect_to_settings_in_projects end + def join_to_org_subfields + if params[:id] + @board = Board.find(params[:id]) + @org_subfield_ids = params[:org_subfield_ids] + @org_subfield_ids.each do |id| + OrgSubfieldBoard.create(:org_subfield_id => id.to_i, :board_id => params[:id].to_i) + end + end + end + private def redirect_to_settings_in_projects redirect_to settings_project_url(@project, :tab => 'boards') diff --git a/app/models/board.rb b/app/models/board.rb index 67d59e599..ba1fae30a 100644 --- a/app/models/board.rb +++ b/app/models/board.rb @@ -19,6 +19,8 @@ class Board < ActiveRecord::Base include Redmine::SafeAttributes belongs_to :project,:touch => true belongs_to :course,:touch=>true + has_many :org_subfield_boards + has_many :org_subfields, :class_name => "OrgSubfield", :through => :org_subfield_boards has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC" has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC" belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb index f95bb3eba..062226e0e 100644 --- a/app/models/org_subfield.rb +++ b/app/models/org_subfield.rb @@ -2,6 +2,8 @@ class OrgSubfield < ActiveRecord::Base belongs_to :organization, :foreign_key => :organization_id has_many :org_document_comments, :dependent => :destroy has_many :files + has_many :org_subfield_boards + has_many :boards, :through => :org_subfield_boards acts_as_attachable def project diff --git a/app/models/org_subfield_board.rb b/app/models/org_subfield_board.rb new file mode 100644 index 000000000..ac820e319 --- /dev/null +++ b/app/models/org_subfield_board.rb @@ -0,0 +1,5 @@ +class OrgSubfieldBoard < ActiveRecord::Base + belongs_to :org_subfield + belongs_to :board + # attr_accessible :title, :body +end diff --git a/config/routes.rb b/config/routes.rb index 4121639c0..da04f63f3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -406,6 +406,7 @@ RedmineApp::Application.routes.draw do # boards match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message' + match 'boards/:id/join_to_org_subfields', :to => 'boards#join_to_org_subfields' get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message' match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post] get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit' diff --git a/db/migrate/20151221023622_create_org_subfield_boards.rb b/db/migrate/20151221023622_create_org_subfield_boards.rb new file mode 100644 index 000000000..06f6f2f17 --- /dev/null +++ b/db/migrate/20151221023622_create_org_subfield_boards.rb @@ -0,0 +1,13 @@ +class CreateTableOrgSubfieldBoards < ActiveRecord::Migration + def up + create_table :org_subfield_boards do |t| + t.integer :org_subfield_id + t.integer :board_id + t.timestamps + end + end + + def down + drop_table :org_subfield_boards + end +end diff --git a/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb b/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb new file mode 100644 index 000000000..d53f9952f --- /dev/null +++ b/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb @@ -0,0 +1,5 @@ +class AddBoardTypeToOrgSubfieldBoards < ActiveRecord::Migration + def change + add_column :org_subfield_boards, :board_type, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 8e946c493..f2c61ac5f 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 => 20151218110033) do +ActiveRecord::Schema.define(:version => 20151222072758) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1196,6 +1196,14 @@ ActiveRecord::Schema.define(:version => 20151218110033) do t.datetime "created_at" end + create_table "org_subfield_boards", :force => true do |t| + t.integer "org_subfield_id" + t.integer "board_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "board_type" + end + create_table "org_subfields", :force => true do |t| t.integer "organization_id" t.integer "priority" @@ -1634,6 +1642,10 @@ ActiveRecord::Schema.define(:version => 20151218110033) do t.string "extra" end + create_table "temp", :id => false, :force => true do |t| + t.integer "id", :default => 0, :null => false + end + create_table "time_entries", :force => true do |t| t.integer "project_id", :null => false t.integer "user_id", :null => false diff --git a/spec/factories/org_subfield_boards.rb b/spec/factories/org_subfield_boards.rb new file mode 100644 index 000000000..0af4bc0d3 --- /dev/null +++ b/spec/factories/org_subfield_boards.rb @@ -0,0 +1,6 @@ +FactoryGirl.define do + factory :org_subfield_board, :class => 'OrgSubfieldBoards' do + + end + +end diff --git a/spec/models/org_subfield_boards_spec.rb b/spec/models/org_subfield_boards_spec.rb new file mode 100644 index 000000000..9a011c015 --- /dev/null +++ b/spec/models/org_subfield_boards_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgSubfieldBoards, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end From fd746c25f3acda39f5a73d804b0de4837691beaa Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 22 Dec 2015 16:11:09 +0800 Subject: [PATCH 008/230] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=94=B9=E4=B8=BAbase64=E4=BC=A0=E8=BE=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/application.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 0cbe647d6..3d9fba942 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -931,7 +931,10 @@ $(function(){ else { if(res.length==1){ - location.href = encodeHomeworkUrl(res[0].file);return; + if(res[0].base64file){ + location.href = encodeHomeworkUrl(res[0].base64file, true);return; + } + location.href = encodeHomeworkUrl(res[0].file);return; } document.getElementById('light').style.display='block'; $container = $('#light .upload_box_ul'); @@ -943,7 +946,12 @@ $(function(){ } else { des = '第'+res[i].index+'个学生的作品下载'; } + + if(res[i].base64file){ + $('
  • '+(i+1)+'. '+des+'  （共'+res[i].size+'M）
    • ').appendTo($container); + } else { $('
  • '+(i+1)+'. '+des+'  （共'+res[i].size+'M）
    • ').appendTo($container); + } } } From 2eca28a10de25d8511b5bb784ecebac1e8710e7b Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 23 Dec 2015 10:02:54 +0800 Subject: [PATCH 009/230] =?UTF-8?q?LastName=20=E5=A7=93=20FirstName=20?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/account.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 30072777e..56cf4b915 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -18,8 +18,8 @@
  • 登录名 : *
  • 邮箱 : *
  • 身份 : *
    • -
  • 姓(First Name) : *
    • -
  • 名(Last Name) : *
    • +
  • 姓(Last Name) : *
    • +
  • 名(First Name) : *
  • 组织名 : *
  • 性别 : 
  • 工作单位 : 
    • From 9dc2cb8541c5c2e0ec4fce897c98c7f97afbf967 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 23 Dec 2015 10:40:50 +0800 Subject: [PATCH 010/230] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E9=99=84=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 2 + .../org_document_comments_controller.rb | 5 +- app/models/org_document_comment.rb | 6 ++ .../_attachment.html.erb | 79 +++++++++++++++++++ app/views/org_document_comments/edit.html.erb | 7 +- app/views/org_document_comments/new.html.erb | 8 +- app/views/org_document_comments/show.html.erb | 3 + 7 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 app/views/org_document_comments/_attachment.html.erb diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 664dc4cf5..9ce76dca8 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -242,6 +242,8 @@ class AttachmentsController < ApplicationController format.html { redirect_to_referer_or mobile_version_path } elsif !@attachment.container.nil? && @attachment.container.is_a?(OrgSubfield) format.html {redirect_to_referer_or org_subfield_files_path(@attachment.container)} + elsif !@attachment.container.nil? && @attachment.container.is_a?(OrgDocumentComment) + format.html {redirect_to_referer_or org_document_comment_path(@attachment.container)} else if @project.nil? format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) } diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index b8584fea3..67d3b247a 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -1,16 +1,18 @@ class OrgDocumentCommentsController < ApplicationController before_filter :find_organization, :only => [:new, :create, :show, :index] - + helper :attachments layout 'base_org' def new @org_document_comment = OrgDocumentComment.new end + def create @org_document_comment = OrgDocumentComment.new(:organization_id => @organization.id, :creator_id => User.current.id) @org_document_comment.title = params[:org_document_comment][:title] @org_document_comment.content = params[:org_document_comment][:content] + @org_document_comment.save_attachments(params[:attachments]) if params[:field_id] @org_document_comment.org_subfield_id = params[:field_id].to_i end @@ -40,6 +42,7 @@ class OrgDocumentCommentsController < ApplicationController def update @org_document = OrgDocumentComment.find(params[:id]) @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content]) + @org_document.save_attachments(params[:attachments]) if @org_document.parent.nil? act = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first act.update_attributes(:updated_at => @org_document.updated_at) diff --git a/app/models/org_document_comment.rb b/app/models/org_document_comment.rb index e2ce350ce..8febbf981 100644 --- a/app/models/org_document_comment.rb +++ b/app/models/org_document_comment.rb @@ -5,6 +5,7 @@ class OrgDocumentComment < ActiveRecord::Base belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id' has_many :editor_of_documents, :dependent => :destroy acts_as_tree :order => "#{OrgDocumentComment.table_name}.sticky asc, #{OrgDocumentComment.table_name}.created_at desc" + acts_as_attachable has_many :org_acts, :class_name => 'OrgActivity',:as =>:org_act ,:dependent => :destroy after_create :document_save_as_org_activity @@ -17,4 +18,9 @@ class OrgDocumentComment < ActiveRecord::Base end end + + def project + + end + end diff --git a/app/views/org_document_comments/_attachment.html.erb b/app/views/org_document_comments/_attachment.html.erb new file mode 100644 index 000000000..86298a330 --- /dev/null +++ b/app/views/org_document_comments/_attachment.html.erb @@ -0,0 +1,79 @@ + +
    + +<% if defined?(container) && container && container.saved_attachments %> + <% container.attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><%= l(:field_is_public) %>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %> + <%= if attachment.id.nil? + #待补充代码 + else + link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') + end + %> + <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %> + + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + +
    + <% end %> + <% container.saved_attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %> + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %> + <%= l(:field_is_public) %>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %> + <%= if attachment.id.nil? + #待补充代码 + else + link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') + end + %> + <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %> + + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + +
    + <% end %> +<% end %> +     +
    + + <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %> + + <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %> + 上传附件 + <%= file_field_tag 'attachments[dummy][file]', + :id => '_file', + :class => 'file_selector', + :multiple => true, + :onchange => 'addInputFiles(this);', + :style => ie8? ? '' : 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js'), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), + :delete_all_files => l(:text_are_you_sure_all) + } %> + + <%= l(:label_no_file_uploaded) %> + + (<%= l(:label_max_size) %>: + <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) + + + <% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> + <% end %> +
    + diff --git a/app/views/org_document_comments/edit.html.erb b/app/views/org_document_comments/edit.html.erb index 33244ef14..6ee42bb08 100644 --- a/app/views/org_document_comments/edit.html.erb +++ b/app/views/org_document_comments/edit.html.erb @@ -33,10 +33,15 @@
    -

    +
    +
    + <%= render :partial => 'org_document_comments/attachment', :locals => {:container => @org_document} %> +
    +
    +
    确定 或 diff --git a/app/views/org_document_comments/new.html.erb b/app/views/org_document_comments/new.html.erb index 24160f6eb..6b0a275c3 100644 --- a/app/views/org_document_comments/new.html.erb +++ b/app/views/org_document_comments/new.html.erb @@ -39,10 +39,14 @@ <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
    - -

    +
    +
    + <%= render :partial => 'org_document_comments/attachment', :locals => {:container => nil} %> +
    +
    +
    确定 diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index 0848bc4e5..5815483e5 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -29,6 +29,9 @@ <%= @document.content.html_safe %>
    <% end %> +
    + <%= link_to_attachments_course @document, :author => false %> +
    From 7688546e7a00ba9356b45cdc9cbafe4abfb2d296 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 23 Dec 2015 11:12:34 +0800 Subject: [PATCH 011/230] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/edit.html.erb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index c8510c8cf..6806e0996 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -21,10 +21,7 @@ $.ajax({ url:' /forums/'+'<%= @memo.forum_id.to_s %>'+'/memos/<%= @memo.id.to_s%>', type:'put', - data:{ - 'memo[subject]':$("#memo_subject").val(), - 'memo[content]':$("#memo_content").val() - }, + data:$("#edit_memo").serialize(), success:function(data){ }, From e8bf93e4ad3e5f8bea48e935f4fc7ad670db426c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 23 Dec 2015 11:13:14 +0800 Subject: [PATCH 012/230] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0but?= =?UTF-8?q?ton=E7=9A=84=E8=B7=AF=E5=BE=84=E5=8E=BB=E6=8E=89project?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/blog_comments/_blog_attachments.erb | 2 +- app/views/forums/_file_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/blog_comments/_blog_attachments.erb b/app/views/blog_comments/_blog_attachments.erb index dd8be659b..86298a330 100644 --- a/app/views/blog_comments/_blog_attachments.erb +++ b/app/views/blog_comments/_blog_attachments.erb @@ -57,7 +57,7 @@ :max_file_size => Setting.attachment_max_size.to_i.kilobytes, :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, - :upload_path => uploads_path(:format => 'js', :project => container), + :upload_path => uploads_path(:format => 'js'), :description_placeholder => l(:label_optional_description), :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), diff --git a/app/views/forums/_file_form.html.erb b/app/views/forums/_file_form.html.erb index 2510952f1..9bbbc9188 100644 --- a/app/views/forums/_file_form.html.erb +++ b/app/views/forums/_file_form.html.erb @@ -58,7 +58,7 @@ :max_file_size => Setting.attachment_max_size.to_i.kilobytes, :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, - :upload_path => uploads_path(:format => 'js', :project => project), + :upload_path => uploads_path(:format => 'js'), :description_placeholder => l(:label_optional_description), :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), From b9ae579622e024060f7f3fb3891a7b3e70ba86b1 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 23 Dec 2015 15:35:26 +0800 Subject: [PATCH 013/230] =?UTF-8?q?=E5=B0=86=E8=AF=BE=E7=A8=8B=E5=B8=96?= =?UTF-8?q?=E5=AD=90=E8=BD=AC=E5=8F=91=E8=87=B3=E7=BB=84=E7=BB=87=E5=B8=96?= =?UTF-8?q?=E5=AD=90=E6=A0=8F=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 20 ++++++- app/models/board.rb | 2 - app/models/message.rb | 2 + app/models/org_subfield.rb | 4 +- app/models/org_subfield_board.rb | 5 -- app/views/messages/_course_show.html.erb | 1 + .../messages/_join_org_subfield_menu.html.erb | 60 +++++++++++++++++++ .../messages/_show_org_subfields.html.erb | 13 ++++ .../messages/get_subfield_on_click_org.js.erb | 2 + app/views/messages/join_org_subfield.js.erb | 11 ++++ app/views/messages/join_org_subfields.js.erb | 2 + .../_org_left_subfield_list.html.erb | 1 + config/routes.rb | 3 + ...151221023622_create_org_subfield_boards.rb | 13 ---- ...8_add_board_type_to_org_subfield_boards.rb | 5 -- db/schema.rb | 8 +-- public/stylesheets/org.css | 15 ++++- public/stylesheets/public.css | 15 ++++- 18 files changed, 148 insertions(+), 34 deletions(-) delete mode 100644 app/models/org_subfield_board.rb create mode 100644 app/views/messages/_join_org_subfield_menu.html.erb create mode 100644 app/views/messages/_show_org_subfields.html.erb create mode 100644 app/views/messages/get_subfield_on_click_org.js.erb create mode 100644 app/views/messages/join_org_subfield.js.erb create mode 100644 app/views/messages/join_org_subfields.js.erb delete mode 100644 db/migrate/20151221023622_create_org_subfield_boards.rb delete mode 100644 db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 6f173b7c2..957d77b8a 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -22,7 +22,7 @@ class MessagesController < ApplicationController default_search_scope :messages before_filter :find_board, :only => [:new, :preview,:edit] before_filter :find_attachments, :only => [:preview] - before_filter :find_message, :except => [:new, :preview] + before_filter :find_message, :except => [:new, :preview, :join_org_subfield, :get_subfield_on_click_org, :join_org_subfields] before_filter :authorize, :except => [:preview, :edit, :destroy, :new] helper :boards @@ -301,6 +301,24 @@ class MessagesController < ApplicationController render :partial => 'common/preview' end + def join_org_subfield + @message = Message.find(params[:message_id]) + @organizations = User.current.organizations + end + + def get_subfield_on_click_org + @org = Organization.find(params[:organization_id]) + end + + def join_org_subfields + org_subfield_ids = params[:org_subfields] + @message = Message.find(params[:id]) + type = @message.board.course_id.nil? ? "Project":"Course" + org_subfield_ids.each do |field_id| + OrgSubfieldMessage.create(:org_subfield_id => field_id.to_i, :message_id => @message.id, :message_type => type) + end + end + private def find_message return unless find_board diff --git a/app/models/board.rb b/app/models/board.rb index ba1fae30a..67d59e599 100644 --- a/app/models/board.rb +++ b/app/models/board.rb @@ -19,8 +19,6 @@ class Board < ActiveRecord::Base include Redmine::SafeAttributes belongs_to :project,:touch => true belongs_to :course,:touch=>true - has_many :org_subfield_boards - has_many :org_subfields, :class_name => "OrgSubfield", :through => :org_subfield_boards has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC" has_many :messages, :dependent => :destroy, :order => "#{Message.table_name}.created_on DESC" belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id diff --git a/app/models/message.rb b/app/models/message.rb index 4cdae1f6e..19531e270 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -23,6 +23,8 @@ class Message < ActiveRecord::Base belongs_to :board,:touch => true belongs_to :author, :class_name => 'User', :foreign_key => 'author_id' has_many :praise_tread, as: :praise_tread_object, dependent: :destroy + has_many :org_subfield_messages, :dependent => :destroy + has_many :org_subfields, :through => :org_subfield_messages acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC" acts_as_attachable diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb index 062226e0e..b63883e81 100644 --- a/app/models/org_subfield.rb +++ b/app/models/org_subfield.rb @@ -2,8 +2,8 @@ class OrgSubfield < ActiveRecord::Base belongs_to :organization, :foreign_key => :organization_id has_many :org_document_comments, :dependent => :destroy has_many :files - has_many :org_subfield_boards - has_many :boards, :through => :org_subfield_boards + has_many :org_subfield_messages, :dependent => :destroy + has_many :messages, :through => :org_subfield_messages acts_as_attachable def project diff --git a/app/models/org_subfield_board.rb b/app/models/org_subfield_board.rb deleted file mode 100644 index ac820e319..000000000 --- a/app/models/org_subfield_board.rb +++ /dev/null @@ -1,5 +0,0 @@ -class OrgSubfieldBoard < ActiveRecord::Base - belongs_to :org_subfield - belongs_to :board - # attr_accessible :title, :body -end diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index e06c04775..1b4c8a0f6 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -57,6 +57,7 @@ :data => {:confirm => l(:text_are_you_sure)}, :class => 'postOptionLink' ) if @message.course_destroyable_by?(User.current) %> + <%= link_to "转发",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %> diff --git a/app/views/messages/_join_org_subfield_menu.html.erb b/app/views/messages/_join_org_subfield_menu.html.erb new file mode 100644 index 000000000..692195892 --- /dev/null +++ b/app/views/messages/_join_org_subfield_menu.html.erb @@ -0,0 +1,60 @@ + + + + + + + + + + +
    +
    转发到
    +
    +
    +
    + +
    + 我的组织 +
    +
      + <% organizations.each do |org| %> +
    • <%= link_to org.name, messages_get_subfield_on_click_org_path(:organization_id => org.id), :remote => true %>
      • + <% end %> +
    +
    + <%= form_tag url_for(:controller => 'messages', :action => 'join_org_subfields', :id => id), :id => 'join-form', :remote => true %> +
    + <%= render :partial => 'show_org_subfields', :locals => {:org => nil} %> +
    +
    +
    取消
    +
    确定
    +
    + + + diff --git a/app/views/messages/_show_org_subfields.html.erb b/app/views/messages/_show_org_subfields.html.erb new file mode 100644 index 000000000..c1fa92990 --- /dev/null +++ b/app/views/messages/_show_org_subfields.html.erb @@ -0,0 +1,13 @@ +
      + + <% if !org.nil? %> + 组织：<%= org.name %> + <% org.org_subfields.where("field_type='Post'").each do |subfield| %> +
    • + +
      • + <% end %> + <% else %> + 请在左侧选择要转发的位置 + <% end %> +
    \ No newline at end of file diff --git a/app/views/messages/get_subfield_on_click_org.js.erb b/app/views/messages/get_subfield_on_click_org.js.erb new file mode 100644 index 000000000..858236a96 --- /dev/null +++ b/app/views/messages/get_subfield_on_click_org.js.erb @@ -0,0 +1,2 @@ +$("#org_subfield_list").html(""); +$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'show_org_subfields', :locals => {:org => @org}) %>"); diff --git a/app/views/messages/join_org_subfield.js.erb b/app/views/messages/join_org_subfield.js.erb new file mode 100644 index 000000000..68e21d4e3 --- /dev/null +++ b/app/views/messages/join_org_subfield.js.erb @@ -0,0 +1,11 @@ +$('#topnav_course_menu').hide(); + +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_org_subfield_menu', :locals => {:organizations => @organizations, :id => @message.id}) %>'); +showModal('ajax-modal', '430px'); +$('#ajax-modal').siblings().hide(); +$('#ajax-modal').before( + ""); +//$('#ajax-modal').css('position','absolute') +$('#ajax-modal').css("top","").css("left",""); +$('#ajax-modal').parent().addClass("resourceSharePopup"); + diff --git a/app/views/messages/join_org_subfields.js.erb b/app/views/messages/join_org_subfields.js.erb new file mode 100644 index 000000000..7cb64e228 --- /dev/null +++ b/app/views/messages/join_org_subfields.js.erb @@ -0,0 +1,2 @@ +hideModal(); +alert("转发成功！"); \ No newline at end of file diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb index 4d85342a6..9032ba62e 100644 --- a/app/views/organizations/_org_left_subfield_list.html.erb +++ b/app/views/organizations/_org_left_subfield_list.html.erb @@ -9,6 +9,7 @@
      + <%= render :partial => 'layouts/org_projects',:locals=>{:projects=>organization.projects.reorder('created_at').uniq.limit(5),:org_id=>organization.id,:page=>1}%>
    diff --git a/config/routes.rb b/config/routes.rb index da04f63f3..c5e890d15 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -415,6 +415,9 @@ RedmineApp::Application.routes.draw do post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply' post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit' post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy' + match 'messages/join_org_subfield', :to => 'messages#join_org_subfield' + match 'messages/get_subfield_on_click_org', :to => 'messages#get_subfield_on_click_org' + match 'messages/join_org_subfields', :to => 'messages#join_org_subfields' # boards end # Misc issue routes. TODO: move into resources diff --git a/db/migrate/20151221023622_create_org_subfield_boards.rb b/db/migrate/20151221023622_create_org_subfield_boards.rb deleted file mode 100644 index 06f6f2f17..000000000 --- a/db/migrate/20151221023622_create_org_subfield_boards.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateTableOrgSubfieldBoards < ActiveRecord::Migration - def up - create_table :org_subfield_boards do |t| - t.integer :org_subfield_id - t.integer :board_id - t.timestamps - end - end - - def down - drop_table :org_subfield_boards - end -end diff --git a/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb b/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb deleted file mode 100644 index d53f9952f..000000000 --- a/db/migrate/20151222072758_add_board_type_to_org_subfield_boards.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddBoardTypeToOrgSubfieldBoards < ActiveRecord::Migration - def change - add_column :org_subfield_boards, :board_type, :string - end -end diff --git a/db/schema.rb b/db/schema.rb index f2c61ac5f..50575eca8 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 => 20151222072758) do +ActiveRecord::Schema.define(:version => 20151223062932) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1196,12 +1196,12 @@ ActiveRecord::Schema.define(:version => 20151222072758) do t.datetime "created_at" end - create_table "org_subfield_boards", :force => true do |t| + create_table "org_subfield_messages", :force => true do |t| t.integer "org_subfield_id" - t.integer "board_id" + t.integer "message_id" + t.string "message_type" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - t.string "board_type" end create_table "org_subfields", :force => true do |t| diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 44dcc70e3..2ffefa48a 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -85,4 +85,17 @@ a.linkGrey8:hover {color:#585858;} .re_con_top span{ color:#999999; font-weight:bold;} ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } -.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} \ No newline at end of file +.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} + +/*转发样式*/ +.shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;} +.shareArrow {background:url(../images/arrowList.png) -90px -108px no-repeat; display:inline-block; width:5px; height:10px; margin-right:3px;} +.sectionWrap {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:220px; background-color:#f1f1f1; min-height:150px; padding-top:5px;} +.columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#fffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;} +.columnWrap li {padding-left:10px; color:#585858;} +.columnWrap span {width:150px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:inline-block;} +.sectionRow:hover {background-color:#cccccc; cursor:pointer;} +.sectionContent {display:none;} +.sectionContent li {padding-left:30px;} +.sectionContent li:hover {background-color:#cccccc; cursor:pointer;} +.sectionContent span {width:175px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:18px; vertical-align:middle;} \ No newline at end of file diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index d9f370c7d..f73f389ae 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -916,4 +916,17 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r .list_style ul li{list-style-type: disc;margin-left: 20px;} /* @功能 定义 */ -span.at {color:#269ac9;} \ No newline at end of file +span.at {color:#269ac9;} + +/*转发样式*/ +.shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;} +.shareArrow {background:url(../images/arrowList.png) -90px -108px no-repeat; display:inline-block; width:5px; height:10px; margin-right:3px;} +.sectionWrap {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:220px; background-color:#f1f1f1; min-height:150px; padding-top:5px;} +.columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#fffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;} +.columnWrap li {padding-left:10px; color:#585858;} +.columnWrap span {width:150px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:inline-block;} +.sectionRow:hover {background-color:#cccccc; cursor:pointer;} +.sectionContent {display:none;} +.sectionContent li {padding-left:30px;} +.sectionContent li:hover {background-color:#cccccc; cursor:pointer;} +.sectionContent span {width:175px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:18px; vertical-align:middle;} \ No newline at end of file From 00711f11006eb79827da014157c83f44a9c732df Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 23 Dec 2015 16:12:23 +0800 Subject: [PATCH 014/230] =?UTF-8?q?issue=E7=BC=96=E8=BE=91=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6=E4=B8=AD=E5=8E=BB=E6=8E=89?= =?UTF-8?q?token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/project_score_helper.rb | 6 +++--- app/models/mailer.rb | 12 ++++++------ app/views/mailer/issue_add.html.erb | 2 +- app/views/mailer/issue_add.text.erb | 2 +- app/views/mailer/issue_edit.html.erb | 2 +- app/views/mailer/issue_edit.text.erb | 2 +- config/locales/zh.yml | 1 + 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/helpers/project_score_helper.rb b/app/helpers/project_score_helper.rb index d73e1592e..a41b7d8ed 100644 --- a/app/helpers/project_score_helper.rb +++ b/app/helpers/project_score_helper.rb @@ -22,10 +22,10 @@ module ProjectScoreHelper #代码提交数量 def changesets_num project - g = Gitlab.client - project.gpid.nil? ? 0 : g.commits_total_count(project.gpid).count + # g = Gitlab.client + # project.gpid.nil? ? 0 : g.commits_total_count(project.gpid).count # # commits_total_count(project.gpid) - # project.changesets.count + project.changesets.count end #讨论区帖子数量 diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 551ddd616..1cbe7421c 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -394,7 +394,7 @@ class Mailer < ActionMailer::Base @issue = issue user = User.find_by_mail(recipients) @user = user - @token = Token.get_token_from_user(user, 'autologin') + # @token = Token.get_token_from_user(user, 'autologin') @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue.id) # edit @@ -436,15 +436,15 @@ class Mailer < ActionMailer::Base user = User.find_by_mail(recipients) @user = user - @token = Token.get_token_from_user(user, 'autologin') + # @token = Token.get_token_from_user(user, 'autologin') # edit - @issue_author_url = url_for(:controller => 'users', :action => 'show', :id => issue.author_id, :token => @token.value) - @project_url = url_for(:controller => 'projects', :action => 'show', :id => issue.project_id, :token => @token.value) - @user_url = url_for(my_account_url(user,:token => @token.value)) + @issue_author_url = url_for(:controller => 'users', :action => 'show', :id => issue.author_id) + @project_url = url_for(:controller => 'projects', :action => 'show', :id => issue.project_id) + @user_url = url_for(my_account_url(user)) - @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value) + @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}") s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] " s << "(#{issue.status.name}) " if journal.new_value_for('status_id') s << issue.subject diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb index d77149831..0d8bb0007 100644 --- a/app/views/mailer/issue_add.html.erb +++ b/app/views/mailer/issue_add.html.erb @@ -6,7 +6,7 @@ <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %> <% else %> - <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> + <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> <% end %> <% end %> diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb index cc2eb814f..1793fb22d 100644 --- a/app/views/mailer/issue_add.text.erb +++ b/app/views/mailer/issue_add.text.erb @@ -4,6 +4,6 @@ <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %> <% else %> - <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> + <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> <% end %> <% end %> diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb index a02fe47f5..16e0967c2 100644 --- a/app/views/mailer/issue_edit.html.erb +++ b/app/views/mailer/issue_edit.html.erb @@ -9,7 +9,7 @@ <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %> <% else %> - <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> + <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> <% end %> <% end %> diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb index d1d625cec..8730d8a16 100644 --- a/app/views/mailer/issue_edit.text.erb +++ b/app/views/mailer/issue_edit.text.erb @@ -9,6 +9,6 @@ <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %> <% else %> - <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> + <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> <% end %> <% end %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 03424bd5a..10241b4b3 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -703,6 +703,7 @@ zh: label_search_by_login: 登录名 label_search_by_name: 名字 label_search_by_email: 邮箱 + label_search_by_occupation: 单位 label_result_plural: 结果 label_all_words: 所有单词 label_wiki: Wiki From 73d377d06d71cf6c626962b2fa7a53bc84310756 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 23 Dec 2015 16:49:05 +0800 Subject: [PATCH 015/230] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E6=98=BE=E7=A4=BA=E8=BD=AC=E5=8F=91=E7=9A=84?= =?UTF-8?q?=E5=B8=96=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 7 +++++++ app/controllers/org_subfields_controller.rb | 14 +++++++++++--- app/controllers/organizations_controller.rb | 2 +- app/models/org_subfield_message.rb | 3 +++ app/views/org_subfields/show.html.erb | 0 app/views/organizations/_org_activities.html.erb | 10 ++++++++++ .../20151223062932_create_org_subfield_messages.rb | 10 ++++++++++ spec/factories/org_subfield_messages.rb | 6 ++++++ spec/models/org_subfield_message_spec.rb | 5 +++++ 9 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 app/models/org_subfield_message.rb create mode 100644 app/views/org_subfields/show.html.erb create mode 100644 db/migrate/20151223062932_create_org_subfield_messages.rb create mode 100644 spec/factories/org_subfield_messages.rb create mode 100644 spec/models/org_subfield_message_spec.rb diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 957d77b8a..d5ce9e0eb 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -313,9 +313,16 @@ class MessagesController < ApplicationController def join_org_subfields org_subfield_ids = params[:org_subfields] @message = Message.find(params[:id]) + # @message.update_attribute(:updated_on, Time.now) type = @message.board.course_id.nil? ? "Project":"Course" org_subfield_ids.each do |field_id| OrgSubfieldMessage.create(:org_subfield_id => field_id.to_i, :message_id => @message.id, :message_type => type) + org_acts = OrgActivity.where("container_type='OrgSubfield' and container_id=? and org_act_type='Message' and org_act_id=?", field_id.to_i, @message.id) + if org_acts.all.size() > 0 + org_acts.first.update_attribute(:updated_at, Time.now) + else + OrgActivity.create(:container_type => 'OrgSubfield', :container_id => field_id.to_i, :org_act_type=>'Message', :org_act_id => @message.id, :user_id => User.current.id) + end end end diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb index 1dc7885fe..26e35fc16 100644 --- a/app/controllers/org_subfields_controller.rb +++ b/app/controllers/org_subfields_controller.rb @@ -6,6 +6,17 @@ class OrgSubfieldsController < ApplicationController @subfield.update_attributes(:priority => @subfield.id, :field_type => params[:field_type]) end + def show + @org_subfield = OrgSubfield.find(params[:id]) + @organization = @org_subfield.organization.id + @messages = [] + @messages << @org_subfield.org_document_comments + @messages << @org_subfield.messages + @messages.sort{|a, b| b.updated_at <=> a.updated_at} + respond_to do |format| + format.html{render :layout => 'base_org'} + end + end def destroy @subfield = OrgSubfield.find(params[:id]) @organization = Organization.find(@subfield.organization_id) @@ -18,7 +29,4 @@ class OrgSubfieldsController < ApplicationController @subfield.update_attributes(:name => params[:name]) end - def show - - end end diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 38402f68e..69437e87f 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -71,7 +71,7 @@ class OrganizationsController < ApplicationController if params[:org_subfield_id] @org_subfield = OrgSubfield.find(params[:org_subfield_id]) @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0 - @org_activities = OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})").order('updated_at desc').page(params[:page] || 1).per(10) + @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10) else project_ids = @organization.projects.map(&:id) << 0 course_ids = @organization.courses.map(&:id) << 0 diff --git a/app/models/org_subfield_message.rb b/app/models/org_subfield_message.rb new file mode 100644 index 000000000..ba8778783 --- /dev/null +++ b/app/models/org_subfield_message.rb @@ -0,0 +1,3 @@ +class OrgSubfieldMessage < ActiveRecord::Base + # attr_accessible :title, :body +end diff --git a/app/views/org_subfields/show.html.erb b/app/views/org_subfields/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb index 8bd1f5bbf..f9dfa8ea2 100644 --- a/app/views/organizations/_org_activities.html.erb +++ b/app/views/organizations/_org_activities.html.erb @@ -49,6 +49,16 @@ <%= render :partial => 'org_course_create', :locals => {:activity => Course.find(act.org_act_id), :user_activity_id => act.id} %> <% end %> <% end %> + <% if act.container_type == 'OrgSubfield' %> + <% if act.org_act_type == 'Message' %> + <% message = Message.find(act.org_act_id) %> + <% if !message.board.course_id.nil? %> + <%= render :partial => 'org_course_message', :locals => {:activity => message,:user_activity_id =>act.id} %> + <% else %> + <%= render :partial => 'organizations/project_message', :locals => {:activity => message,:user_activity_id =>act.id} %> + <% end %> + <% end %> + <% end %> <% end %> <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> diff --git a/db/migrate/20151223062932_create_org_subfield_messages.rb b/db/migrate/20151223062932_create_org_subfield_messages.rb new file mode 100644 index 000000000..b5e4c2028 --- /dev/null +++ b/db/migrate/20151223062932_create_org_subfield_messages.rb @@ -0,0 +1,10 @@ +class CreateOrgSubfieldMessages < ActiveRecord::Migration + def change + create_table :org_subfield_messages do |t| + t.integer :org_subfield_id + t.integer :message_id + t.string :message_type + t.timestamps + end + end +end diff --git a/spec/factories/org_subfield_messages.rb b/spec/factories/org_subfield_messages.rb new file mode 100644 index 000000000..a3d6b391b --- /dev/null +++ b/spec/factories/org_subfield_messages.rb @@ -0,0 +1,6 @@ +FactoryGirl.define do + factory :org_subfield_message, :class => 'OrgSubfieldMessage' do + + end + +end diff --git a/spec/models/org_subfield_message_spec.rb b/spec/models/org_subfield_message_spec.rb new file mode 100644 index 000000000..806fa5ba9 --- /dev/null +++ b/spec/models/org_subfield_message_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe OrgSubfieldMessage, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 19f84b111b28c1ede77c51e34e11710563085eb0 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 23 Dec 2015 17:16:35 +0800 Subject: [PATCH 016/230] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8C=89=E5=A4=A9?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8E=BB=E6=8E=89token=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mailer/send_for_user_activities.html.erb | 96 +++++++++--------- .../mailer/send_for_user_activities.text.erb | 98 +++++++++---------- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index ae5604099..7fdd737e3 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -16,16 +16,16 @@
  • ▪ [ - <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value), + <%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value), :class => "wmail_name", + <%= link_to course_new.author, user_activities_url(course_new.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_project_notice) %> - <%= link_to truncate(course_new.title.html_safe,length: 30,omission: '...'), news_url(course_new,:token => @token.value), + <%= link_to truncate(course_new.title.html_safe,length: 30,omission: '...'), news_url(course_new), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -39,17 +39,17 @@ ▪ [ <% unless course_news_comment.commented.nil? %> - <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value), + <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <% end %> ] - <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value), :class => "wmail_name", + <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_project_notice_reply) %> - <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value), + <%= link_to truncate(l(:label_course_notice_point),length: 30,omission: '...'), news_url(course_news_comment.commented), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -72,16 +72,16 @@ ▪ [ - <%= link_to truncate(bid.course.name,length: 30,omission: '...'), course_url(bid.course, :token => @token.value), + <%= link_to truncate(bid.course.name,length: 30,omission: '...'), course_url(bid.course), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value), :class => "wmail_name", + <%= link_to bid.user, user_activities_url(bid.user), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_course_homework) %> - <%= link_to truncate(bid.name.html_safe,length: 30,omission: '...'), student_work_index_url(:homework => bid.id,:token => @token.value), + <%= link_to truncate(bid.name.html_safe,length: 30,omission: '...'), student_work_index_url(:homework => bid.id), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -105,16 +105,16 @@ ▪ [ - <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value), + <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value), :class => "wmail_name", + <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_send_course_journals_for_messages) %> - <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value), + <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -135,14 +135,14 @@
  • ▪ [ - <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id, :token => @token.value), + <%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course.id), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value), :class => "wmail_name", + <%= link_to course_message.author, user_activities_url(course_message.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_send_course_messages) %> - <%= link_to truncate(course_message.subject.html_safe,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value), + <%= link_to truncate(course_message.subject.html_safe,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= format_time(course_message.created_on) %> @@ -163,16 +163,16 @@ ▪ [ - <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value), + <%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value), :class => "wmail_name", + <%= link_to attachment.author, user_activities_url(attachment.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_course_file_upload) %> - <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value), + <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -199,14 +199,14 @@
  • ▪ [ - <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value), + <%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value), :class => "wmail_name", + <%= link_to issue.author, user_activities_url(issue.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_project_issue) %> - <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue, :token => @token.value), + <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue), :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= format_time(issue.created_on) %> @@ -217,14 +217,14 @@
  • ▪ [ - <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value), + <%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value), :class => "wmail_name", + <%= link_to issues_journal.user, user_activities_url(issues_journal.user), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_project_issue_update) %> - <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue, :token => @token.value), + <%= link_to truncate(issues_journal.issue.subject, length:30,omission:'...'),issue_url(issues_journal.issue), :style => "color:#2E8DD7;float:left;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" @@ -251,16 +251,16 @@ ▪ [ - <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value), + <%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value), :class => "wmail_name", + <%= link_to project_message.author, user_activities_url(project_message.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_send_course_messages) %> - <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value), + <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -283,16 +283,16 @@ ▪ [ <% unless wikicontent.page.nil? %> - <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value), + <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <% end %> ] - <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value), :class => "wmail_name", + <%= link_to wikicontent.author, user_activities_url(wikicontent.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_wiki_mail_notification) %> <% unless wikicontent.page.nil? %> - <%= link_to wikicontent.text.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe, project_wiki_url(wikicontent.page.wiki,:token => @token.value), + <%= link_to wikicontent.text.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe, project_wiki_url(wikicontent.page.wiki), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; max-width:400px;height:23px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <% end %> @@ -314,15 +314,15 @@ ▪ [ - <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value), + <%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value), :class => "wmail_name", + <%= link_to project_new.author, user_activities_url(project_new.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_project_mail_notice) %> - <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new,:token => @token.value), + <%= link_to truncate(project_new.title,length: 30,omission: '...'), news_url(project_new), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= format_time(project_new.created_on) %> @@ -336,16 +336,16 @@ ▪ [ <% unless project_news_comment.commented.nil? %> - <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value), + <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <% end %> ] - <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value), :class => "wmail_name", + <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:lable_project_mail_notice_reply) %> - <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value), + <%= link_to truncate(l(:lable_project_notice_point),length: 30,omission: '...'), news_url(project_news_comment.commented), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= format_time(project_news_comment.created_on) %> @@ -366,16 +366,16 @@ ▪ [ - <%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project, :token => @token.value), + <%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to project_attachment.author, user_activities_url(project_attachment.author,:token => @token.value), :class => "wmail_name", + <%= link_to project_attachment.author, user_activities_url(project_attachment.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_project_mail_upload) %> - <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'), project_files_url(project_attachment.project,:token => @token.value), + <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'), project_files_url(project_attachment.project), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -398,16 +398,16 @@ ▪ [ - <%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value), + <%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project), :class=> "wmail_column", :style=> " font-weight: bold; display:block; float:left; color:#666;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> ] - <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value), :class => "wmail_name", + <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%> <%= l(:label_send_course_journals_for_messages) %> - <%= link_to project_journal_message.notes.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe, project_feedback_url(project_journal_message.project,:token => @token.value), + <%= link_to project_journal_message.notes.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe, project_feedback_url(project_journal_message.project), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -434,12 +434,12 @@
  • ▪ - <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value), + <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= l(:label_show_your_message) %> - <%= link_to user_journal_message.notes.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe,feedback_url(@user,:token => @token.value), + <%= link_to user_journal_message.notes.gsub("

    ","").gsub("

    ","").gsub("
    ","").html_safe,feedback_url(@user), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; max-width:400px; max-height:30px;font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -466,12 +466,12 @@
  • ▪ - <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value), + <%= link_to forum.creator, user_activities_url(forum.creator), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= l(:label_forum_new) %> - <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value), + <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum), :class => 'wmail_info', :style => "color:#2E8DD7;float:left; font-weight:normal;margin-right:5px; display:block;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> @@ -492,7 +492,7 @@
  • ▪ - <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value), + <%= link_to memo.author, user_activities_url(memo.author), :class => "wmail_name", :style => "color:#2E8DD7; float:left;display:block; margin-right:5px; margin-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %> @@ -516,7 +516,7 @@ <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %> <% else %> - <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> + <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> <% end %> <% end %> diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb index f86dec62d..f4c354790 100644 --- a/app/views/mailer/send_for_user_activities.text.erb +++ b/app/views/mailer/send_for_user_activities.text.erb @@ -6,11 +6,11 @@ <%= l(:label_course_news) %> <% @course_news.each do |course_new|%> - ▪[<%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course, :token => @token.value)%> ] + ▪[<%= link_to truncate(course_new.course.name,length: 30,omission: '...'), course_url(course_new.course)%> ] - <%= link_to course_new.author, user_activities_url(course_new.author,:token => @token.value) %> + <%= link_to course_new.author, user_activities_url(course_new.author) %> <%= l(:label_project_notice) %> - <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new,:token => @token.value) %> + <%= link_to truncate(course_new.title,length: 30,omission: '...'), news_url(course_new) %> <%= format_time(course_new.created_on) %> <% end %> <% end %> @@ -19,12 +19,12 @@ <%= l(:label_course_news) %> <% @course_news_comments.each do |course_news_comment|%> ▪[ <% unless course_news_comment.commented.nil? %> - <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course, :token => @token.value) %> + <%= link_to truncate(course_news_comment.commented.course.name,length: 30,omission: '...'), course_url(course_news_comment.commented.course) %> <% end %> ] - <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author,:token => @token.value) %> + <%= link_to course_news_comment.author, user_activities_url(course_news_comment.author) %> <%= l(:label_project_notice_reply) %> - <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented,:token => @token.value) %> + <%= link_to truncate(course_news_comment.comments,length: 30,omission: '...'), news_url(course_news_comment.commented) %> <%= format_time(course_news_comment.created_on) %> <% end %> <% end %> @@ -33,10 +33,10 @@ <%= l(:label_homework_overview) %> <% unless @bids.first.nil?%> <% @bids.each do |bid| %> - ▪[<%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course, :token => @token.value) %>] - <%= link_to bid.user, user_activities_url(bid.user,:token => @token.value) %> + ▪[<%= link_to truncate(bid.course.name,length: 30,omission: '...'),course_url(bid.course) %>] + <%= link_to bid.user, user_activities_url(bid.user) %> <%= l(:label_course_homework) %> - <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id,:token => @token.value) %> + <%= link_to truncate(bid.name, length: 30,omission: '...'), student_work_index_path(:homework => bid.id) %> <%= format_time(bid.created_at) %> <% end %> <% end %> @@ -46,10 +46,10 @@ <% unless @course_journal_messages.first.nil? %> <%= l(:view_course_journals_for_messages) %> <% @course_journal_messages.each do |course_journal_message|%> - [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course, :token => @token.value) %>] - <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user,:token => @token.value) %> + [ <%= link_to truncate(course_journal_message.course.name,length: 30,omission: '...'), course_url(course_journal_message.course) %>] + <%= link_to course_journal_message.user, user_activities_url(course_journal_message.user) %> <%= l(:label_send_course_journals_for_messages) %> - <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course,:token => @token.value) %> + <%= link_to truncate(course_journal_message.notes.html_safe,length: 30,omission: '...'), course_feedback_url(course_journal_message.course) %> <%= format_time(course_journal_message.created_on) %> <% end %> <% end %> @@ -57,10 +57,10 @@ <% unless @course_messages.first.nil? %> <%= l(:view_borad_course) %> <% @course_messages.each do |course_message|%> - ▪[<%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course, :token => @token.value)%>] - <%= link_to course_message.author, user_activities_url(course_message.author,:token => @token.value) %> + ▪[<%= link_to truncate(course_message.course.name,length: 30,omission: '...'), course_url(course_message.course)%>] + <%= link_to course_message.author, user_activities_url(course_message.author) %> <%= l(:label_send_course_messages) %> - <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id,:token => @token.value) %> + <%= link_to truncate(course_message.subject,length: 30,omission: '...'),board_message_url(course_message, :board_id => course_message.board_id) %> <%= format_time(course_message.created_on) %> <% end %> <% end %> @@ -68,10 +68,10 @@ <% unless @attachments.first.nil? %> <%= l(:label_course_mail_files) %> <% @attachments.each do |attachment|%> - ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course, :token => @token.value) %>] - <%= link_to attachment.author, user_activities_url(attachment.author,:token => @token.value) %> + ▪[<%= link_to truncate(attachment.course.name,length: 30,omission: '...'), course_url(attachment.course) %>] + <%= link_to attachment.author, user_activities_url(attachment.author) %> <%= l(:label_course_file_upload) %> - <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course,:token => @token.value) %> + <%= link_to truncate(attachment.filename,length: 30,omission: '...'),course_files_url(attachment.course) %> <%= format_time(attachment.created_on) %> <% end %> @@ -86,10 +86,10 @@ <% unless @issues.first.nil? %> <%= l(:label_issue_tracking) %> <% @issues.each do |issue|%> - ▪[<%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project, :token => @token.value) %>] - <%= link_to issue.author, user_activities_url(issue.author,:token => @token.value) %> + ▪[<%= link_to truncate(issue.project.name,length: 30,omission: '...'), project_url(issue.project) %>] + <%= link_to issue.author, user_activities_url(issue.author) %> <%= l(:label_project_issue) %> - <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue, :token => @token.value) %> + <%= link_to truncate(issue.subject,length: 30,omission: '...'),issue_url(issue) %> <%= format_time(issue.created_on) %> <% end %> @@ -99,13 +99,13 @@ <% unless @issues_journals.first.nil? %> <%= l(:label_issue_tracking) %> <% @issues_journals.each do |issues_journal| %> - ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project, :token => @token.value) %>] - <%= link_to issues_journal.user, user_activities_url(issues_journal.user,:token => @token.value) %> + ▪[<%= link_to truncate(issues_journal.issue.project.name,length: 30,omission: '...'), project_url(issues_journal.issue.project) %>] + <%= link_to issues_journal.user, user_activities_url(issues_journal.user) %> <%= l(:label_project_issue_update) %> <% if issues_journal.notes.nil? %> - <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue, :token => @token.value) %> + <%= link_to truncate(issues_journal.issue.subject,length: 30,omission: '...'),issue_url(issue) %> <% else %> - <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue, :token => @token.value) %> + <%= link_to truncate(issues_journal.notes.html_safe,length: 30,omission: '...'),issue_url(issues_journal.issue) %> <% end %> <%= format_time(issues_journal.created_on) %> <% end %> @@ -115,10 +115,10 @@ <% unless @project_messages.first.nil? %> <%= l(:project_moule_boards_show) %> <% @project_messages.each do |project_message|%> - ▪[<%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project, :token => @token.value) %>] - <%= link_to project_message.author, user_activities_url(project_message.author,:token => @token.value) %> + ▪[<%= link_to truncate(project_message.project.name,length: 30,omission: '...'), project_url(project_message.project) %>] + <%= link_to project_message.author, user_activities_url(project_message.author) %> <%= l(:label_send_course_messages) %> - <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id,:token => @token.value) %> + <%= link_to truncate(project_message.subject,length: 30,omission: '...'),board_message_url(project_message, :board_id => project_message.board_id) %> <%= format_time(project_message.created_on) %> <% end %> @@ -129,13 +129,13 @@ <%= l(:label_wiki) %> <% @wiki_contents.each do |wikicontent|%> ▪[<% unless wikicontent.page.nil? %> - <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project, :token => @token.value) %> + <%= link_to truncate(wikicontent.page.wiki.project.name,length: 30,omission: '...'), project_url(wikicontent.page.wiki.project) %> <% end %> ] - <%= link_to wikicontent.author, user_activities_url(wikicontent.author,:token => @token.value) %> + <%= link_to wikicontent.author, user_activities_url(wikicontent.author) %> <%= l(:label_wiki_mail_notification) %> <% unless wikicontent.page.nil? %> - <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki,:token => @token.value) %> + <%= link_to truncate(wikicontent.text.html_safe, length: 30,omission: '...'), project_wiki_url(wikicontent.page.wiki) %> <% end %> <%= format_time(wikicontent.updated_on) %> <% end %> @@ -145,10 +145,10 @@ <% unless @project_news.first.nil? %> <%= l(:label_project_news) %> <% @project_news.each do |project_new|%> - ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project, :token => @token.value) %> ] - <%= link_to project_new.author, user_activities_url(project_new.author,:token => @token.value) %> + ▪[<%= link_to truncate(project_new.project.name,length: 30,omission: '...'), project_url(project_new.project) %> ] + <%= link_to project_new.author, user_activities_url(project_new.author) %> <%= l(:label_project_mail_notice) %> - <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new,:token => @token.value) %> + <%= link_to truncate(project_new.title.html_safe,length: 30,omission: '...'), news_url(project_new) %> <%= format_time(project_new.created_on) %> <% end %> <% end %> @@ -158,11 +158,11 @@ <%= l(:label_project_news) %> <% @project_news_comments.each do |project_news_comment|%> ▪[ <% unless project_news_comment.commented.nil? %> - <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project, :token => @token.value) %> + <%= link_to truncate(project_news_comment.commented.project.name,length: 30,omission: '...'), project_url(project_news_comment.commented.project) %> <% end %>] - <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author,:token => @token.value) %> + <%= link_to project_news_comment.author, user_activities_url(project_news_comment.author) %> <%= l(:lable_project_mail_notice_reply) %> - <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented,:token => @token.value) %> + <%= link_to truncate(project_news_comment.comments.html_safe,length: 30,omission: '...'), news_url(project_news_comment.commented) %> <%= format_time(project_news_comment.created_on) %> <% end %> @@ -172,10 +172,10 @@ <% unless @project_attachments.first.nil? %> <%= l(:label_project_mail_attachments) %> <% @project_attachments.each do |project_attachment|%> - ▪[<%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project, :token => @token.value) %>] - <%= link_to project_attachment.author, user_activities_url(project_attachment.author,:token => @token.value) %> + ▪[<%= link_to truncate(project_attachment.project.name,length: 30,omission: '...'), project_url(project_attachment.project) %>] + <%= link_to project_attachment.author, user_activities_url(project_attachment.author) %> <%= l(:label_project_mail_upload) %> - <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project,:token => @token.value) %> + <%= link_to truncate(project_attachment.filename,length: 30,omission: '...'),project_files_url(project_attachment.project) %> <%= format_time(project_attachment.created_on) %> <% end %> <% end %> @@ -184,10 +184,10 @@ <% unless @project_journal_messages.first.nil? %> <%= l(:label_project_mail_feedback) %> <% @project_journal_messages.each do |project_journal_message|%> - ▪[<%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project, :token => @token.value) %> ] - <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user,:token => @token.value) %> + ▪[<%= link_to truncate(project_journal_message.project.name,length: 30,omission: '...'), project_url(project_journal_message.project) %> ] + <%= link_to project_journal_message.user, user_activities_url(project_journal_message.user) %> <%= l(:label_send_course_journals_for_messages) %> - <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project,:token => @token.value) %> + <%= link_to truncate(project_journal_message.notes.html_safe,length: 30,omission: '...'), project_feedback_url(project_journal_message.project) %> <%= format_time(project_journal_message.created_on) %> <% end %> @@ -202,9 +202,9 @@ <%= l(:label_user_message) %> (<%= @user_journal_messages.count %>) <% @user_journal_messages.each do |user_journal_message|%> - ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user,:token => @token.value)%> + ▪ <%= link_to user_journal_message.user, user_activities_url(user_journal_message.user)%> <%= l(:label_show_your_message) %> - <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user,:token => @token.value) %> + <%= link_to truncate(user_journal_message.notes.html_safe,length: 30,omission: '...'), feedback_url(@user) %> <%= format_time(user_journal_message.created_on) %> <% end %> <% end %> @@ -214,9 +214,9 @@ <% unless @forums.first.nil? %> <%= l(:label_user_forum) %> <% @forums.each do |forum|%> - ▪<%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %> + ▪<%= link_to forum.creator, user_activities_url(forum.creator) %> <%= l(:label_forum_new) %> - <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum,:token => @token.value) %> + <%= link_to truncate(forum.name.html_safe,length: 30,omission: '...'),forum_url(forum) %> <%= format_time(forum.created_at) %> <% end %> @@ -224,7 +224,7 @@ <% unless @memos.first.nil? %> <%= l(:label_user_message_forum) %> <% @memos.each do |memo|%> - ▪<%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%> + ▪<%= link_to memo.author, user_activities_url(memo.author)%> <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %> <%= link_to truncate(memo.subject.html_safe,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))%> <%= format_time(memo.created_at) %> @@ -238,6 +238,6 @@ <% if Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten][@user.mail_notification] == mail_option %> <%= l(mail_option) %> <% else %> - <%= link_to l(mail_option), my_change_mail_notification_url(token: @token.value,mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> + <%= link_to l(mail_option), my_change_mail_notification_url(mail_notification: Hash[*User::MAIL_NOTIFICATION_OPTIONS.flatten].invert[mail_option]), :style => "margin-top:20px;color:#2775d2; margin-left:10px;" %> <% end %> <% end %> From 055fac5e2716b369a40172479c7d9976fdac6906 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 23 Dec 2015 17:29:40 +0800 Subject: [PATCH 017/230] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BE=97=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/project_score_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/project_score_helper.rb b/app/helpers/project_score_helper.rb index a41b7d8ed..d73e1592e 100644 --- a/app/helpers/project_score_helper.rb +++ b/app/helpers/project_score_helper.rb @@ -22,10 +22,10 @@ module ProjectScoreHelper #代码提交数量 def changesets_num project - # g = Gitlab.client - # project.gpid.nil? ? 0 : g.commits_total_count(project.gpid).count + g = Gitlab.client + project.gpid.nil? ? 0 : g.commits_total_count(project.gpid).count # # commits_total_count(project.gpid) - project.changesets.count + # project.changesets.count end #讨论区帖子数量 From 9e0b88c186d84c1bce17e706e5f158394fd87daa Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 24 Dec 2015 09:46:18 +0800 Subject: [PATCH 018/230] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=E6=A0=B7=E5=BC=8F=E6=94=B9=E6=88=90=E6=96=B9=E5=9D=97?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/boards/_project_new_topic.html.erb | 72 +++- app/views/boards/_project_show.html.erb | 232 ++----------- .../boards/_project_show_detail.html.erb | 70 ++++ app/views/layouts/base_projects.html.erb | 2 +- app/views/messages/_form_project.html.erb | 64 +++- app/views/messages/_project_show.html.erb | 309 ++++++++++++------ app/views/users/_project_message.html.erb | 4 +- 7 files changed, 424 insertions(+), 329 deletions(-) create mode 100644 app/views/boards/_project_show_detail.html.erb diff --git a/app/views/boards/_project_new_topic.html.erb b/app/views/boards/_project_new_topic.html.erb index 00a3d2016..2259cc5bb 100644 --- a/app/views/boards/_project_new_topic.html.erb +++ b/app/views/boards/_project_new_topic.html.erb @@ -1,11 +1,65 @@ -<%= form_for @message, :url =>{:controller=>'messages',:action => 'new', :board_id => @board.id, :is_board => 'true'},:html => {:nhname=>'form', :multipart => true, :id => 'message-form', :name=>'message-form'} do |f| %> +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: true, prettify: false) %> +<% end %> - <%= render :partial => 'form_project', :locals => {:f => f, :topic => @message} %> -
  • -
    - <%= l(:button_cancel) %> +<%= error_messages_for 'message' %> +
    +
    +
    +
    + +

    +
    +
    • -<% end %> \ No newline at end of file + <%= f.kindeditor :content, :editor_id => 'message_content_editor', + :owner_id => topic.nil? ? 0: topic.id, + :owner_type => OwnerTypeHelper::MESSAGE, + :width => '100%', + :height => 300, + :minHeight=>300, + :class => 'talk_text fl', + :input_html => { :id => 'message_content', + :class => 'talk_text fl', + :maxlength => 5000 }, + at_id: topic.id, at_type: topic.class.to_s + %> +
    +

    + +
    +
    +
    + <%= render :partial => 'attachments/form_course', :locals => {:container => topic, :isReply => @isReply} %> +
    +
    +
    +
    + <%if !edit_mode %> + 确定 + 或 + 取消 + <% else %> + 确定 + 或 + <%= link_to "取消",board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "fr mr10 mt3"%> + <% end %> +
    +
    + + + + \ No newline at end of file diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index 839d587b2..8a11d2859 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -1,204 +1,44 @@ -
    -
    -

    - <% if User.current.language == "zh"%> - <%= h @board.name %> - <% else %> - <%= l(:project_module_boards) %> - <% end %> -

    - <% if User.current.logged? %> - <%= l(:label_message_new) %> - <% end %> -
    -
    - <% if !User.current.logged? %> -
    - <%= l(:label_user_login_project_board) %> - <%= link_to l(:label_user_login_new), signin_path, :class => "c_blue ml5" %> + + +
    +
    +
    + 项目讨论区
    - <% end %> -
    -
    -
    -
    -
    -

    讨论区共有<%= @topic_count %>个帖子

    - <% if @topics.any? %> - <% @topics.each do |topic| %> -
    - <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %> -
    - <% author = topic.author.to_s %> -
    - <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl f14",:title=>author, - :style=>'max-width:80px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;' %> -
    -

      :

    - -

      <%= h(topic.subject) %>

    - - <% if topic.editable_by?(User.current) %> - <%= l(:button_edit) %> - <% end %> - <%= link_to(l(:button_delete), {:controller =>'messages',:action => 'destroy', :id => topic.id, :board_id => topic.board_id, :is_board=>'true'}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :class => 'talk_edit fr', - :style => ' margin-right: 10px;') if topic.destroyable_by?(User.current) %> - <% if topic.sticky? %> - <%= l(:label_board_sticky)%> - <% end %> - - -
    -
    -
    - <%= topic.content.html_safe %> - -
    -
    - - <%= link_to_attachments_course topic, :author => false %> - <%= l(:label_activity_time)%>：  <%= format_time topic.created_on %> -
    - <% if User.current.logged? %> - <%= l(:button_reply) %> - <% end %> -
    - -
    -
    - <% reply = Message.new(:subject => "RE: #{topic.subject}")%> - <% if !topic.locked? && authorize_for('messages', 'reply') %> - - <% end %> -
    - <% replies_all = topic.children.includes(:author, :attachments, {:board => :project}).reorder("#{Message.table_name}.id desc").all %> - <% unless replies_all.empty? %> -
    -
      - <% replies_all_i = 0 %> - <% replies_all.each do |message| %> - <% replies_all_i=replies_all_i+1 %> -
    • - <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %> -
      - <%= link_to_user_header message.author,false,:class => 'fl c_orange f14 ' %> -
      -
      - <%= textAreailizable message,:content,:attachments => message.attachments %> - -
      - -
      - <%= format_time(message.created_on) %> - <%= link_to(l(:button_delete),{:controller => 'messages', :action => 'destroy', :id => message.id, :board_id => message.board_id, :is_board => 'true'}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete), - :class => ' c_dblue fr f14') if message.course_destroyable_by?(User.current) %> - <%= link_to(l(:button_reply), 'javascript:;', - :nhname =>'showbtn_child_reply', - :class => ' c_dblue fr f14', - :style => 'margin-right: 10px;', - :title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %> -
      -
      -
      • - <% end %> -
    -
    - <%if topic.replies_count>2 %> -
    - 展开回复(<%= topic.replies_count.to_s%>) -
    - <% end %> - <% end %> -
    -
    + <% if User.current.logged? %> + <%= labelled_form_for @message, :url =>{:controller=>'messages',:action => 'new', :board_id => @board.id, :is_board => 'true'}, + :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %> + <%#= render :partial => 'project_new_topic', :locals => {:f => f, :topic => @message, :edit_mode => false, :course => @board.course} %> + <%= render :partial => 'project_new_topic', :locals => {:f => f, :topic => @message, :edit_mode => false, :project => @board.project} %> <% end %> - <% else %> -

    <%= l(:label_no_data) %>

    - <% end %> -
      - <%= pagination_links_full @topic_pages, @topic_count, :per_page_links => false, :remote => false, :flag => true %> -
    - - -<%# other_formats_links do |f| %> - <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> -<%# end %> - <% html_title @board.name %> - <% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %> <% end %> + <%= render :partial=> 'project_show_detail',:locals =>{:topics => @topics, :page => 0} %>
    -
    + + + + + + <% if topic %> + <%= render :partial => 'users/project_message', :locals => {:activity => topic,:user_activity_id =>topic.id} %> + <% end %> + <% end %> + + <% if topics.count == 10 %> +
    展开更多<%= link_to "", boards_topic_path(@board, :project_id => @board.project.id ,:page => page), :id => "more_topic_link", :remote => "true", :class => "none" %>
    + <% end %> +<% end%> + + \ No newline at end of file diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index f7dcc40f5..433d30214 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -12,7 +12,7 @@ <%= favicon %> <%= javascript_heads %> <%= heads_for_theme %> - <%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %> + <%= stylesheet_link_tag 'public', 'pleft', 'project','courses','prettify','jquery/jquery-ui-1.9.2','header','repository' %> <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %> <%= call_hook :view_layouts_base_html_head %> diff --git a/app/views/messages/_form_project.html.erb b/app/views/messages/_form_project.html.erb index bf91b3517..57d8a27c2 100644 --- a/app/views/messages/_form_project.html.erb +++ b/app/views/messages/_form_project.html.erb @@ -1,16 +1,23 @@ + +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> +<% end %> + <%= error_messages_for 'message' %> <% replying ||= false %> -<% extra_option = replying ? { readonly: true} : { maxlength: 200 } %> +<% extra_option = replying ? { hidden: "hidden"} : { maxlength: 200 } %> +
  • - +
    <% if replying %> - <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585" }.merge(extra_option) %> +
    <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585 fl" }.merge(extra_option) %>
    <% else %> <%= f.text_field :subject, { size: 60, id: "message_subject", onkeyup: "regexSubject();",:class=>"talk_input w585" }.merge(extra_option) %> +

    <% end %> -

    +
    • -
  • +
  • <% unless replying %> <% if @message.safe_attribute? 'sticky' %> <%= f.check_box :sticky %> @@ -24,20 +31,45 @@
  • -
    - +
    + <%= text_area :quote,:quote,:style => 'display:none' %> - <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %> + <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> + <% if replying %> + <%= f.kindeditor :content, :editor_id => 'message_content_editor', + :width => '99%', + :height => 100, + :minHeight=>100, + :input_html => { :id => 'message_content', + :class => 'talk_text fl', + :maxlength => 5000 }%> + <% else %> + <%= f.kindeditor :content, :editor_id => 'message_content_editor', + :owner_id => @message.nil? ? 0: @message.id, + :owner_type => OwnerTypeHelper::MESSAGE, + :width => '90%', + :height => 300, + :minHeight=>300, + :class => 'talk_text fl', + :input_html => { :id => 'message_content', + :class => 'talk_text fl', + :maxlength => 5000 }%> + <% end %>
    -

    +

    • -
  • - -
    - <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %> -
    -
    • +<% unless replying %> +
  • + +
    + <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %> +
    +
    • +<% end %>
  • -
    • \ No newline at end of file + diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index 28b9e28d5..b20a7c22d 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -1,104 +1,3 @@ -
    -

    <%= h @board.name %>

    -
    -
    -
    - <%=link_to image_tag(url_to_avatar(@topic.author), :width => "46", :height => "46"), user_path(@topic.author) %> -
    -
    -

    - <%= @topic.subject %>

    -
    -

    由<%= link_to_user_header @topic.author,false,:class=> 'problem_name c_orange' %> 添加于<%= format_time(@topic.created_on) %>

    -
    - - <%#= watcher_link(@topic, User.current) %> - <%= link_to( - l(:button_edit), - {:action => 'edit', :id => @topic}, - :class => 'talk_edit fr' - ) if @message.editable_by?(User.current) %> - <%= link_to( - l(:button_delete), - {:action => 'destroy', :id => @topic}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :class => 'talk_edit fr' - ) if @message.destroyable_by?(User.current) %> -
    -
    <%= textilizable(@topic, :content) %>
    -
    <%= link_to_attachment_project @topic, :author => false %>
    - -
    - <% if User.current.logged? %> - <%= toggle_link l(:button_reply), "reply", :focus => 'message_content',:class => 'talk_edit fr' %> - <% else %> - <%= link_to l(:button_reply), signin_path,:class => 'talk_edit fr' %> - <% end %> - <%= link_to( - l(:button_quote), - {:action => 'quote', :id => @topic}, - :remote => true, - :method => 'get', - :class => 'talk_edit fr', - :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %> -
    -
    -<% unless @replies.empty? %> - <% reply_count = 0 %> - <% @replies.each do |message| %> -
    "> -
    <%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %>
    -
    -
    - <%= link_to_user_header message.author,false,:class => 'c_blue fb fl mb10 ' %> - <%= format_time(message.created_on) %> -
    -

    <%= textAreailizable message,:content,:attachments => message.attachments %>

    - <%= link_to_attachments_course message, :author => false %> -
    -
    - <%= link_to( - l(:button_quote), - {:action => 'quote', :id => message}, - :remote => true, - :method => 'get', - :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %> - <%= link_to( - #image_tag('edit.png'), - l(:button_edit), - {:action => 'edit', :id => message}, - :title => l(:button_edit) - ) if message.course_editable_by?(User.current) %> - <%= link_to( - #image_tag('delete.png'), - l(:button_delete), - {:action => 'destroy', :id => message}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) - ) if message.course_destroyable_by?(User.current) %> -
    -
    -
    -
    -
    - <% end %> -<% end %> -<% if !@topic.locked? && authorize_for('messages', 'reply') %> - -<% end %> -
      - <%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false, :remote => false, :flag => true%> -
    -<% html_title @topic.subject %> \ No newline at end of file + + + + +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: true) %> +<% end %> + + + + +
    +
    +
    + <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %> +
    +
    + <% if @topic.author.id == User.current.id%> + + <%end%> +
    + 主题: <%= @topic.subject%> +
    +
    + +
    + <% if @topic.try(:author).try(:realname) == ' ' %> + <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <% else %> + <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <% end %> +
    +
    <%= format_time( @topic.created_on)%>
    +
    +
    + <%= @topic.content.html_safe%> +
    +
    +
    + <%= link_to_attachments_course @topic, :author => false %> +
    +
    +
    +
    +
    +
    + <% unless @replies.empty? %> +
    +
    回复（<%=@reply_count %>）
    +
    + +
    +
    + <% @replies.each_with_index do |reply,i| %> + +
    +
    + <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> +
    +
    +
    + <% if reply.try(:author).try(:realname) == ' ' %> + <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <% else %> + <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <% end %> +
    +
    + <%= reply.content.html_safe%> +
    +
    + <%= format_time(reply.created_on) %> + +
    +

    +
    +
    +
    + <% end %> +
    + + <% end %> +
    + <% if !@topic.locked? && authorize_for('messages', 'reply') %> +
    + +
    +
    + <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %> + <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %> + <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'project_board_cancel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %> + <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'project_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %> + <% end %> +
    +
    +
    + <% end %> +
    +
    \ No newline at end of file diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 14c37096e..96d74d82f 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -16,10 +16,10 @@
    <% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" + <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey" + <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey" %> <% end %>
    From eb7d0761cb5c8b81be42296b762e15d7cd527c88 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 24 Dec 2015 10:37:13 +0800 Subject: [PATCH 019/230] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=A0=8F=E4=BF=AE=E6=94=B9=E6=88=90=E5=92=8C=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9B=B8=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 27 ++--- public/stylesheets/org.css | 175 ++++++++++++++-------------- 2 files changed, 99 insertions(+), 103 deletions(-) diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 93af3fd29..e17562ecc 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -46,13 +46,13 @@ - + <% else %>
  • 登录
    • @@ -197,19 +197,14 @@ } } $(document).ready(function(){ - $("#orgUser,#orgSwitch").click(function(){ - $(".org_login_list").toggle(); - if($("#orgArrow").attr("class") == "orgMenuArrow"){ - $("#orgArrow").attr("class","orgMenuArrow2"); - } - else { - $("#orgArrow").attr("class","orgMenuArrow") ; - } - }); - if($(".org_login_list").children().click){ - $(".org_login_list").css("display","none"); - $("#orgArrow").attr("class","orgMenuArrow"); - }; + $("#orgUser,#orgSwitch,.org_login_list").mouseover(function () { + $(".org_login_list").css("display", "block"); + $("#orgArrow").attr("class", "orgMenuArrow2"); + }); + $("#orgUser,#orgSwitch,.org_login_list").mouseout(function () { + $(".org_login_list").css("display", "none"); + $("#orgArrow").attr("class", "orgMenuArrow"); + }); }); diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index 44dcc70e3..e425d12c9 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -1,88 +1,89 @@ -@charset "utf-8"; -/* CSS Document */ - -.orgName {width:130px; color:#484848;} -.organization_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;} -.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} - -.orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;} -.orgBorder {width:628px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} -.orgOpActive {border-bottom:3px solid #269ac9 !important; color:#444444;} -.logoBorder {border:1px solid #eaeaea; padding:2px;} -.logoBorder:hover {border:1px solid #269ac9;} -.logoEnter {border:1px solid #eaeaea; padding:2px 5px; margin-top:37px;} -.orgNameInput {width:600px; outline:none; border:1px solid #eaeaea; float:right; height:22px;} -.orgRow {font-size:14px; color:#484848;} -.orgDes {width:600px; height:150px; outline:none; border:1px solid #eaeaea; float:right; resize:none;} -.w607 {width:607px;} -.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;} -a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;} -a.saveBtn:hover {background-color:#297fb8;} -.orgMemberList {width:410px; float:left;} -.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;} -.orgListUser {width:119px; float:left;} -.orgListRole {width:180px; float:left;} -.orgMemContainer {width:278px;} -.orgMemberAdd {float:right; width:240px;} -.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} -.undis {display:none;} -.dis {display:inline-block;} -.upbtn { margin: 40px 0px 0px 15px; - display: block; - padding: 2px 5px; - border: 1px solid #EAEAEA;} - -a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;} - -/*项目关联css*/ -.relateOrg {width:335px;} -.relatedList {width:335px;} -.searchOrg {height:24px; width:200px; color:#9b9b9b; border:1px solid #15bccf;} -a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;} -a.cancelBtn:hover {background-color:#717171; color:#ffffff;} -.relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;} -.relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} -.relatedListOption {width:80px; text-align:center;} -.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} -.search_org {width:150px; max-width:200px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} - -/*组织列表*/ -.mt28 {margin-top:28px;} -.orgWrap {width:880px; float:left;} -.orgTitle {width:880px; max-width:880px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; } -.orgIntro {width:880px; max-width:880px; margin-bottom:6px; color:#484848;} - -/*关联项目弹窗*/ -.projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px; overflow:auto; overflow-x:hidden; width:288px;} -.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;} - -/*组织首页新151204Tim*/ -.orgNav {width:1000px; height:30px; background-color:#cfcfcf; margin:0 auto;} -.orgContainer {width:100%; margin:0 auto; background-color:#cfcfcf;} -.navOrgLogo {width:21px; height:30px; margin-left:2px; margin-right:15px;} -.navOrgMenu {display:inline-block;height:30px; line-height:30px; vertical-align:middle;} -a.linkGrey8 {color:#888888;} -a.linkGrey8:hover {color:#585858;} -.orgBorder {width:583px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} -.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;} -.orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;} -.orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;} -.org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;} -#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;} - -.orgListStatus {width:55px; float:left;} -.reCon{ margin:5px; width:710px;} -.retop{width:710px; height:40px; background:#eaeaea; padding:5px;} -.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right} -.re_search{ margin-top:7px; margin-left:5px;} -.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;padding-left: 0px;} -.b_lblue{ background:#64bdd9;} -.c_grey{ color:#888888;} -.re_con{ margin:5px; width:665px;} -.re_con_top{color:#494949; } -.re_con_top span{ color:#999999; font-weight:bold;} -ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } - +@charset "utf-8"; +/* CSS Document */ + +.orgName {width:130px; color:#484848;} +.organization_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;} +.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;} + +.orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;} +.orgBorder {width:628px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} +.orgOpActive {border-bottom:3px solid #269ac9 !important; color:#444444;} +.logoBorder {border:1px solid #eaeaea; padding:2px;} +.logoBorder:hover {border:1px solid #269ac9;} +.logoEnter {border:1px solid #eaeaea; padding:2px 5px; margin-top:37px;} +.orgNameInput {width:600px; outline:none; border:1px solid #eaeaea; float:right; height:22px;} +.orgRow {font-size:14px; color:#484848;} +.orgDes {width:600px; height:150px; outline:none; border:1px solid #eaeaea; float:right; resize:none;} +.w607 {width:607px;} +.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;} +a.saveBtn {padding:3px 5px; background-color:#269ac9; color:#ffffff;} +a.saveBtn:hover {background-color:#297fb8;} +.orgMemberList {width:410px; float:left;} +.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px;} +.orgListUser {width:119px; float:left;} +.orgListRole {width:180px; float:left;} +.orgMemContainer {width:278px;} +.orgMemberAdd {float:right; width:240px;} +.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} +.undis {display:none;} +.dis {display:inline-block;} +.upbtn { margin: 40px 0px 0px 15px; + display: block; + padding: 2px 5px; + border: 1px solid #EAEAEA;} + +a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;} + +/*项目关联css*/ +.relateOrg {width:335px;} +.relatedList {width:335px;} +.searchOrg {height:24px; width:200px; color:#9b9b9b; border:1px solid #15bccf;} +a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;} +a.cancelBtn:hover {background-color:#717171; color:#ffffff;} +.relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;} +.relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;} +.relatedListOption {width:80px; text-align:center;} +.relateOrgName {width:240px; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} +.search_org {width:150px; max-width:200px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;color:#656565;} + +/*组织列表*/ +.mt28 {margin-top:28px;} +.orgWrap {width:880px; float:left;} +.orgTitle {width:880px; max-width:880px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; } +.orgIntro {width:880px; max-width:880px; margin-bottom:6px; color:#484848;} + +/*关联项目弹窗*/ +.projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px; overflow:auto; overflow-x:hidden; width:288px;} +.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;} + +/*组织首页新151204Tim*/ +.orgNav {width:1000px; height:30px; background-color:#cfcfcf; margin:0 auto;} +.orgContainer {width:100%; margin:0 auto; background-color:#cfcfcf;} +.navOrgLogo {width:21px; height:30px; margin-left:2px; margin-right:15px;} +.navOrgMenu {display:inline-block;height:30px; line-height:30px; vertical-align:middle;} +a.linkGrey8 {color:#888888;} +a.linkGrey8:hover {color:#585858;} +.orgBorder {width:583px; height:21px; border-bottom:3px solid #e4e4e4; float:left;} +.orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;} +.orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;} +.orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;} +.org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;} +#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;} +.org_login_list a {color:#269ac9;} + +.orgListStatus {width:55px; float:left;} +.reCon{ margin:5px; width:710px;} +.retop{width:710px; height:40px; background:#eaeaea; padding:5px;} +.resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right} +.re_search{ margin-top:7px; margin-left:5px;} +.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;padding-left: 0px;} +.b_lblue{ background:#64bdd9;} +.c_grey{ color:#888888;} +.re_con{ margin:5px; width:665px;} +.re_con_top{color:#494949; } +.re_con_top span{ color:#999999; font-weight:bold;} +ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } + .popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} \ No newline at end of file From 59f42bb54fcd95608091ea90275a7ecf97928191 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 24 Dec 2015 11:09:57 +0800 Subject: [PATCH 020/230] =?UTF-8?q?1.=E5=B0=86=E6=B7=BB=E5=8A=A0=E9=99=84?= =?UTF-8?q?=E5=8A=A0=E5=8A=9F=E8=83=BD=E5=8A=A0=E5=85=A5=E5=88=B0=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0=EF=BC=9B=202.=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E7=BC=96=E8=BE=91=E6=96=87=E7=AB=A0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=8A=E4=BC=A0=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_document_comments_controller.rb | 5 ++++- app/views/attachments/_form_course.html.erb | 3 +-- app/views/org_document_comments/_attachment.html.erb | 2 +- app/views/org_document_comments/_new.html.erb | 8 ++++++-- app/views/organizations/_project_message.html.erb | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index 67d3b247a..7685b77a8 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -28,6 +28,7 @@ class OrgDocumentCommentsController < ApplicationController redirect_to new_org_document_comment_path(:organization_id => @organization.id) end end + def show @document = OrgDocumentComment.find(params[:id]) end @@ -39,10 +40,12 @@ class OrgDocumentCommentsController < ApplicationController render_403 end end + def update @org_document = OrgDocumentComment.find(params[:id]) @org_document.update_attributes(:title => params[:org_document_comment][:title], :content => params[:org_document_comment][:content]) - @org_document.save_attachments(params[:attachments]) + Attachment.attach_files(@org_document, params[:attachments]) + # @org_document.save_attachments(params[:attachments]) if @org_document.parent.nil? act = OrgActivity.where("org_act_type='OrgDocumentComment' and org_act_id =?", @org_document.id).first act.update_attributes(:updated_at => @org_document.updated_at) diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb index ef5385647..348c5339d 100644 --- a/app/views/attachments/_form_course.html.erb +++ b/app/views/attachments/_form_course.html.erb @@ -61,8 +61,7 @@ :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), :delete_all_files => l(:text_are_you_sure_all), - :lebel_file_uploding => l(:lebel_file_uploding), - :containerid => "#{container.id}" + :lebel_file_uploding => l(:lebel_file_uploding) } %> <% if container.nil? %> <%= l(:label_no_file_uploaded)%> diff --git a/app/views/org_document_comments/_attachment.html.erb b/app/views/org_document_comments/_attachment.html.erb index 86298a330..5cdcfa041 100644 --- a/app/views/org_document_comments/_attachment.html.erb +++ b/app/views/org_document_comments/_attachment.html.erb @@ -63,7 +63,7 @@ :are_you_sure => l(:text_are_you_sure), :file_count => l(:label_file_count), :lebel_file_uploding => l(:lebel_file_uploding), - :delete_all_files => l(:text_are_you_sure_all) + :containerid => "#{container.id}" } %> <%= l(:label_no_file_uploaded) %> diff --git a/app/views/org_document_comments/_new.html.erb b/app/views/org_document_comments/_new.html.erb index 8d9eb6b02..3d8e8bc23 100644 --- a/app/views/org_document_comments/_new.html.erb +++ b/app/views/org_document_comments/_new.html.erb @@ -45,10 +45,14 @@
    -

    - +
    +
    + <%= render :partial => 'org_document_comments/attachment', :locals => {:container => nil} %> +
    +
    +
    确定 或 diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb index 2708bb546..037dfe61b 100644 --- a/app/views/organizations/_project_message.html.erb +++ b/app/views/organizations/_project_message.html.erb @@ -16,10 +16,10 @@
    <% if activity.parent_id.nil? %> - <%= link_to activity.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" + <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe, project_boards_path(activity.project,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey" + <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board,activity), :class=> "postGrey" %> <% end %>
    From 7d7d9b77b53ca1a172dd5473e52e1387b69a2e7e Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 24 Dec 2015 11:58:00 +0800 Subject: [PATCH 021/230] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=A0=B7=E5=BC=8F=E6=94=B9=E6=88=90=E6=96=B9?= =?UTF-8?q?=E5=9D=97=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boards/_project_message_edit.html.erb | 16 ++++++++++++++ app/views/messages/edit.html.erb | 21 +++++-------------- 2 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 app/views/boards/_project_message_edit.html.erb diff --git a/app/views/boards/_project_message_edit.html.erb b/app/views/boards/_project_message_edit.html.erb new file mode 100644 index 000000000..88297bd79 --- /dev/null +++ b/app/views/boards/_project_message_edit.html.erb @@ -0,0 +1,16 @@ + +
    +
    +
    + 编辑帖子 +
    +
    + <%= render :partial => 'boards/project_new_topic', + :locals => {:f => f, :edit_mode => edit_mode, :topic => topic, :project => project} %> +
    \ No newline at end of file diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb index 624174b14..7543e16e2 100644 --- a/app/views/messages/edit.html.erb +++ b/app/views/messages/edit.html.erb @@ -1,26 +1,16 @@ <% if @message.project %> -
    -

    <%= l(:label_course_board) %>

    -
    - - - <%#= board_breadcrumb(@message) %> - -
    -
      <%= form_for @message, {:as => :message, :url => {:action => 'edit'}, :html => {:multipart => true, :id => 'message-form', :method => :post} } do |f| %> - <%= render :partial => 'form_project', - :locals => {:f => f, :replying => !@message.parent.nil?} %> - <%= l(:button_submit) %> - <%= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "blue_btn grey_btn fl c_white" %> -
    -
    + <%= render :partial => 'boards/project_message_edit', + :locals => {:f => f, :edit_mode => true, :topic => @message, :project => @message.project} %> + + <%#= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "blue_btn grey_btn fl c_white" %> <% end %> + <% elsif @message.course %> <%= form_for @message, { :as => :message, @@ -31,7 +21,6 @@ } do |f| %> <%= render :partial => 'boards/course_message_edit', :locals => {:f => f, :edit_mode => true, :topic => @message, :course => @message.course} %> - <% end %> <% end %> From 7d35931460e9aa9c4a719dc1d9550d768621c0e9 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Dec 2015 15:27:49 +0800 Subject: [PATCH 022/230] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/hjq_test.rake | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 lib/tasks/hjq_test.rake diff --git a/lib/tasks/hjq_test.rake b/lib/tasks/hjq_test.rake new file mode 100644 index 000000000..77b4bd22c --- /dev/null +++ b/lib/tasks/hjq_test.rake @@ -0,0 +1,16 @@ +namespace :hjq do + namespace :news do + desc "news order" + task :users => :environment do + a = [] + news = News.where("course_id =?", 122) + news.each do |new| + unless new.comments.blank? + new = new.comments.sort! { |a,b| a.created_on <=> b.created_on}.last.commented + end + a << new + end + puts a.length + end + end +end From a92d33300bafbfc4d076c45e85de956f84010d4e Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Dec 2015 17:18:52 +0800 Subject: [PATCH 023/230] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20=E2=80=9C=E5=B7=B2=E8=A7=A3=E5=86=B3=E2=80=9D?= =?UTF-8?q?=EF=BC=8C=E5=8C=BA=E5=88=86=E5=B7=B2=E8=A7=A3=E5=86=B3=E5=92=8C?= =?UTF-8?q?=E5=B7=B2=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 +++- public/stylesheets/public.css | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c4bbc4ebb..4bdffb9dc 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -253,8 +253,10 @@ module ApplicationHelper subject = truncate(subject, :length => 60) end end - if issue.status_id == 5 + if issue.status_id == 3 s = link_to text, issue_path(issue), :class => "text_line_s", :title => title + elsif issue.status_id == 5 + s = link_to text, issue_path(issue), :class => "text_line_s del_line", :title => title else s = link_to text, issue_path(issue), :class => "c_blue", :title => title end diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index d9f370c7d..7047316c6 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -916,4 +916,5 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r .list_style ul li{list-style-type: disc;margin-left: 20px;} /* @功能 定义 */ -span.at {color:#269ac9;} \ No newline at end of file +span.at {color:#269ac9;} +.del_line{text-decoration:line-through !important;} \ No newline at end of file From ad4656454558e5603dee7e453286c62079e44484 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 25 Dec 2015 10:06:48 +0800 Subject: [PATCH 024/230] test --- lib/tasks/hjq_test.rake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/tasks/hjq_test.rake b/lib/tasks/hjq_test.rake index 77b4bd22c..f0be77fe6 100644 --- a/lib/tasks/hjq_test.rake +++ b/lib/tasks/hjq_test.rake @@ -3,14 +3,16 @@ namespace :hjq do desc "news order" task :users => :environment do a = [] - news = News.where("course_id =?", 122) - news.each do |new| + # news = News.where("course_id =?", 122) + course.news.each do |new| unless new.comments.blank? - new = new.comments.sort! { |a,b| a.created_on <=> b.created_on}.last.commented + latest_comment = new.comments.sort! { |a,b| a.created_on <=> b.created_on}.last end - a << new + a << latest_comment end - puts a.length + comments = a.map(&:commented_id).detect{|a.b| a.created_on <=> b.created_on} + # comments = a.sort!{|a.b| a.created_on <=> b.created_on} + news = News.where("id in (?)", comments) end end end From 1a24505eac99ed6c421bc924412c7e8390497ea7 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 25 Dec 2015 15:27:45 +0800 Subject: [PATCH 025/230] =?UTF-8?q?footer=E6=96=B0=E5=A2=9E=E5=9B=BE?= =?UTF-8?q?=E7=89=87=EF=BC=8C=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_footer.html.erb | 80 +++++++++--------- app/views/layouts/base_org.html.erb | 17 +--- .../images/footer_logo/BeiHang_university.png | Bin 0 -> 8096 bytes public/images/footer_logo/CVICSE.png | Bin 0 -> 9688 bytes public/images/footer_logo/ISCAS_logo.png | Bin 0 -> 7948 bytes .../images/footer_logo/PekingUniversity.png | Bin 0 -> 9854 bytes public/images/footer_logo/bee_logo.png | Bin 0 -> 7265 bytes public/stylesheets/new_user.css | 3 +- public/stylesheets/public.css | 2 +- 9 files changed, 46 insertions(+), 56 deletions(-) create mode 100644 public/images/footer_logo/BeiHang_university.png create mode 100644 public/images/footer_logo/CVICSE.png create mode 100644 public/images/footer_logo/ISCAS_logo.png create mode 100644 public/images/footer_logo/PekingUniversity.png create mode 100644 public/images/footer_logo/bee_logo.png diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 13730fd96..1db3091d7 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,39 +1,43 @@ - + <% if !edit_mode || edit_mode && homework.homework_detail_manual.comment_status < 2 %> +
    + + 启用匿评 +
    + <% end %>

    @@ -68,12 +86,12 @@
    <% if edit_mode %> - 确定 + 确定 或 <%#= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%> 取消 <% else %> - 发送 + 发送 或 取消 <% end %> From 7412c1caf63257632a601b62f622543368b0c015 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 25 Dec 2015 16:04:49 +0800 Subject: [PATCH 028/230] =?UTF-8?q?=E6=B7=BB=E5=8A=A0footer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_footer.html.erb | 28 ++++++++++++++++------------ app/views/layouts/base_org.html.erb | 17 +---------------- lib/tasks/hjq_test.rake | 18 ------------------ 3 files changed, 17 insertions(+), 46 deletions(-) delete mode 100644 lib/tasks/hjq_test.rake diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 13730fd96..fca343af4 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -12,24 +12,28 @@
      diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index 93af3fd29..d481651e6 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -149,22 +149,7 @@
      - + <%= render :partial => 'layouts/new_footer' %>
      diff --git a/lib/tasks/hjq_test.rake b/lib/tasks/hjq_test.rake deleted file mode 100644 index f0be77fe6..000000000 --- a/lib/tasks/hjq_test.rake +++ /dev/null @@ -1,18 +0,0 @@ -namespace :hjq do - namespace :news do - desc "news order" - task :users => :environment do - a = [] - # news = News.where("course_id =?", 122) - course.news.each do |new| - unless new.comments.blank? - latest_comment = new.comments.sort! { |a,b| a.created_on <=> b.created_on}.last - end - a << latest_comment - end - comments = a.map(&:commented_id).detect{|a.b| a.created_on <=> b.created_on} - # comments = a.sort!{|a.b| a.created_on <=> b.created_on} - news = News.where("id in (?)", comments) - end - end -end From e5b4b9915d8f7e0310a36942a9ffb832db9f27c7 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 25 Dec 2015 16:06:24 +0800 Subject: [PATCH 029/230] =?UTF-8?q?=E6=B7=BB=E5=8A=A0footer=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/footer_logo/BeiHang_university.png | Bin 0 -> 8096 bytes public/images/footer_logo/CVICSE.png | Bin 0 -> 9688 bytes public/images/footer_logo/ISCAS_logo.png | Bin 0 -> 7948 bytes public/images/footer_logo/PekingUniversity.png | Bin 0 -> 9854 bytes public/images/footer_logo/bee_logo.png | Bin 0 -> 7265 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/images/footer_logo/BeiHang_university.png create mode 100644 public/images/footer_logo/CVICSE.png create mode 100644 public/images/footer_logo/ISCAS_logo.png create mode 100644 public/images/footer_logo/PekingUniversity.png create mode 100644 public/images/footer_logo/bee_logo.png diff --git a/public/images/footer_logo/BeiHang_university.png b/public/images/footer_logo/BeiHang_university.png new file mode 100644 index 0000000000000000000000000000000000000000..f393aa3e8579d1ddb355bed47cc32928186fd72b GIT binary patch literal 8096 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 literal 0 HcmV?d00001 diff --git a/public/images/footer_logo/ISCAS_logo.png b/public/images/footer_logo/ISCAS_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..7c2eb9ff7263062b4b472a2544791044aec1f3c9 GIT binary patch literal 7948 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 P{j`drrb3mRRmlGV(~{0^ literal 0 HcmV?d00001 diff --git a/public/images/footer_logo/PekingUniversity.png b/public/images/footer_logo/PekingUniversity.png new file mode 100644 index 0000000000000000000000000000000000000000..533e9f7e238f577cdd709e5a16cacfe78a6608ce GIT binary patch literal 9854 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 literal 0 HcmV?d00001 diff --git a/public/images/footer_logo/bee_logo.png b/public/images/footer_logo/bee_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..6628eee95747676d3bd2824b49ea5df2fa0816d6 GIT binary patch literal 7265 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 Date: Fri, 25 Dec 2015 16:13:17 +0800 Subject: [PATCH 030/230] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=95=E9=83=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org.html.erb | 215 ++++++++++++++-------------- public/stylesheets/new_user.css | 3 +- public/stylesheets/org.css | 7 +- public/stylesheets/public.css | 2 +- 4 files changed, 113 insertions(+), 114 deletions(-) diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb index d481651e6..a0e84f1e5 100644 --- a/app/views/layouts/base_org.html.erb +++ b/app/views/layouts/base_org.html.erb @@ -43,16 +43,16 @@ <%#= link_to '首页', organization_path(@organization, :show_homepage => 1),:class=>"linkGrey8 f14" %> <% if User.current.logged? %> -
    - - + + <% else %>
  • 登录
    • @@ -75,126 +75,121 @@
    -
    -
    -
    -
    - - - -