From 20a08561bc1e08e4637aab7a0cd8cb54807a817c Mon Sep 17 00:00:00 2001 From: Axel Naumann Date: Tue, 29 Mar 2016 18:41:13 +0000 Subject: [PATCH 001/125] Make PgSQL happy ("ActiveRecord::StatementInvalid: PG::ProtocolViolation"). See https://meta.discourse.org/t/install-error-protocol-violation-with-postgresql/35160 --- config/database.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/database.yml b/config/database.yml index fb6d923aea..e9a2a50369 100644 --- a/config/database.yml +++ b/config/database.yml @@ -16,6 +16,7 @@ development: # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: + prepared_statements: false adapter: postgresql database: discourse_test min_messages: warning From c0d81a298e543fa14383a554837003a611d88c28 Mon Sep 17 00:00:00 2001 From: Nick Ivanter Date: Fri, 15 Apr 2016 21:59:46 +0300 Subject: [PATCH 002/125] Add 'alt' tag to logo img in digest email The rationale for this is that the logo, as any other image, is not loaded by default by many email clients. In absence of an 'alt' tag, it shows an empty space in the email. Having the site title in there seems better. --- app/views/user_notifications/digest.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index fe5962f669..acf396294b 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -5,7 +5,7 @@ <%- if logo_url.blank? %> <%= SiteSetting.title %> <%- else %> - + <%- end %> From cd4c34204d9a01f07202e030030c6ee5aa60a20b Mon Sep 17 00:00:00 2001 From: shakti katare Date: Tue, 19 Apr 2016 18:02:01 +0530 Subject: [PATCH 003/125] Fix: Suspensions and Blocks do not give enough details in logs --- app/jobs/regular/export_csv_file.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb index ddb6d6b929..7c69a3a3fe 100644 --- a/app/jobs/regular/export_csv_file.rb +++ b/app/jobs/regular/export_csv_file.rb @@ -225,13 +225,15 @@ module Jobs elsif attr == 'staff_user' user = User.find_by(id: staff_action.attributes['acting_user_id']) user.username if !user.nil? + elsif attr == 'subject' + user = User.find_by(id: staff_action.attributes['target_user_id']) + user.nil? ? staff_action.attributes[attr] : "#{user.username} #{staff_action.attributes[attr]}" else staff_action.attributes[attr] end staff_action_array.push(data) end - staff_action_array end From f43f0452f8d65f43193e7001874dda04671187cf Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 20 Apr 2016 16:26:00 -0700 Subject: [PATCH 004/125] we auto-set DB RAM and unicorns now based on detected CPU and RAM --- docs/INSTALL-cloud.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 4c0faf053c..48a37b3a35 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -63,9 +63,7 @@ We recommend Nano because it's simple; just use your arrow keys to edit. - Place your [Email Server credentials][mailconfig] in `DISCOURSE_SMTP_ADDRESS`, `DISCOURSE_SMTP_PORT`, `DISCOURSE_SMTP_USER_NAME`, `DISCOURSE_SMTP_PASSWORD`. Be sure you remove the comment `#` character and space from the front of these lines as necessary. -- If you are using a 1 GB instance, set `UNICORN_WORKERS` to 2 and `db_shared_buffers` to 128MB so you have more memory room. - - + Please be careful while editing and double check your work; YAML is _very_ sensitive to incorrect spacing and misplaced characters. After completing your edits, press CtrlO then Enter to save and CtrlX to exit. From 3aa8593dabb335ba81de170a5a7dcc5327ad9ae6 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 20 Apr 2016 19:19:12 -0400 Subject: [PATCH 005/125] Version bump to v1.6.0.beta2 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index 48cc209af3..3431cc5334 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 6 TINY = 0 - PRE = 'beta1' + PRE = 'beta2' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end From f7d0e8461d3c97003dd2b44a1bcc3e864dc51494 Mon Sep 17 00:00:00 2001 From: Dean Taylor Date: Thu, 21 Apr 2016 02:23:58 +0100 Subject: [PATCH 006/125] Minor spelling mistake and language consistency "Return" instead of "Return". "unactivated" changed to "deactivated". Mostly "cannot" is currently used, changed existing "can not" occurrences. "there was no attachments" to "there were no attachments". --- config/locales/server.en.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index c5eab8c7e6..966723f90f 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -43,7 +43,7 @@ en: powered_by_html: 'Powered by Discourse, best viewed with JavaScript enabled' log_in: "Log In" - purge_reason: "Automatically deleted as abandoned, unactivated account" + purge_reason: "Automatically deleted as abandoned, deactivated account" disable_remote_images_download_reason: "Remote images download was disabled because there wasn't enough disk space available." anonymous: "Anonymous" @@ -55,7 +55,7 @@ en: empty_email_error: "Happens when the raw mail we received was blank." no_message_id_error: "Happens when the mail has no 'Message-Id' header." auto_generated_email_error: "Happens when the 'precedence' header is set to: list, junk, bulk or auto_reply, or when any other header contains: auto-submitted, auto-replied or auto-generated." - no_body_detected_error: "Happens when we couldn't extract a body and there was no attachments." + no_body_detected_error: "Happens when we couldn't extract a body and there were no attachments." inactive_user_error: "Happens when the sender is not active." blocked_user_error: "Happens when the sender has been blocked." bad_destination_address: "Happens when none of the email addresses in To/Cc/Bcc fields matched a configured incoming email address." @@ -222,7 +222,7 @@ en: groups: errors: - can_not_modify_automatic: "You can not modify an automatic group" + can_not_modify_automatic: "You cannot modify an automatic group" member_already_exist: "'%{username}' is already a member of this group." invalid_domain: "'%{domain}' is not a valid domain." invalid_incoming_email: "'%{email}' is not a valid email address." @@ -540,7 +540,7 @@ en: continue_button: "Continue to %{site_name}" welcome_to: "Welcome to %{site_name}!" approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!" - missing_session: "We can not detect if your account was created, please ensure you have cookies enabled." + missing_session: "We cannot detect if your account was created, please ensure you have cookies enabled." post_action_types: off_topic: title: 'Off-Topic' @@ -819,7 +819,7 @@ en: title: "The name of this site, as used in the title tag." site_description: "Describe this site in one sentence, as used in the meta description tag." contact_email: "Email address of key contact responsible for this site. Used for critical notifications such as unhandled flags, as well as on the /about contact form for urgent matters." - bounce_email: "Variable Email Return Path used for emails, example: bounce@example.com will cause us to generate bounce+GUID@example.com as the Retrun Path for emails we send. This feature allows us to automatically disable bouncing emails. Requires additional configurations, leave blank if unsure." + bounce_email: "Variable Email Return Path used for emails, example: bounce@example.com will cause us to generate bounce+GUID@example.com as the Return Path for emails we send. This feature allows us to automatically disable bouncing emails. Requires additional configurations, leave blank if unsure." contact_url: "Contact URL for this site. Used on the /about contact form for urgent matters." queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken." crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions." From b744306654c716a2306b1c5b2f98c39a3e70d465 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 20 Apr 2016 09:34:30 +0800 Subject: [PATCH 007/125] PERF: Uglify and gzip assets concurrently. --- lib/tasks/assets.rake | 54 +++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index 3e68b4213b..dd71a22f84 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake @@ -116,6 +116,16 @@ def compress(from,to) end end +def concurrent? + if ENV["CONCURRENT"] == "1" + concurrent_compressors = [] + yield(Proc.new { |&block| concurrent_compressors << Concurrent::Future.execute { block.call } }) + concurrent_compressors.each(&:wait!) + else + yield(Proc.new { |&block| block.call }) + end +end + task 'assets:precompile' => 'assets:precompile:before' do # Run after assets:precompile Rake::Task["assets:precompile:css"].invoke @@ -124,30 +134,34 @@ task 'assets:precompile' => 'assets:precompile:before' do puts "Compressing Javascript and Generating Source Maps" manifest = Sprockets::Manifest.new(assets_path) - to_skip = Rails.configuration.assets.skip_minification || [] - manifest.files - .select{|k,v| k =~ /\.js$/} - .each do |file, info| + concurrent? do |proc| + to_skip = Rails.configuration.assets.skip_minification || [] + manifest.files + .select{|k,v| k =~ /\.js$/} + .each do |file, info| - path = "#{assets_path}/#{file}" - _file = (d = File.dirname(file)) == "." ? "_#{file}" : "#{d}/_#{File.basename(file)}" - _path = "#{assets_path}/#{_file}" + path = "#{assets_path}/#{file}" + _file = (d = File.dirname(file)) == "." ? "_#{file}" : "#{d}/_#{File.basename(file)}" + _path = "#{assets_path}/#{_file}" - if File.exists?(_path) - STDERR.puts "Skipping: #{file} already compressed" - else - STDERR.puts "Compressing: #{file}" + if File.exists?(_path) + STDERR.puts "Skipping: #{file} already compressed" + else + STDERR.puts "Compressing: #{file}" - # We can specify some files to never minify - unless (ENV["DONT_MINIFY"] == "1") || to_skip.include?(info['logical_path']) - FileUtils.mv(path, _path) - compress(_file,file) + proc.call do + # We can specify some files to never minify + unless (ENV["DONT_MINIFY"] == "1") || to_skip.include?(info['logical_path']) + FileUtils.mv(path, _path) + compress(_file,file) + end + + info["size"] = File.size(path) + info["mtime"] = File.mtime(path).iso8601 + gzip(path) + end end - - info["size"] = File.size(path) - info["mtime"] = File.mtime(path).iso8601 - gzip(path) - end + end end # protected From b4e0c5afe03394d6ce5cbde6d7218a2713ca16d4 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 21 Apr 2016 14:45:16 +0800 Subject: [PATCH 008/125] FIX: Fetch stats if it has not been cached. --- app/jobs/scheduled/about_stats.rb | 6 +---- app/jobs/scheduled/dashboard_stats.rb | 6 +---- app/jobs/stats.rb | 9 ------- app/models/concerns/stats_cacheable.rb | 17 ++++++++++++- spec/jobs/about_stats_spec.rb | 12 ++++++--- spec/jobs/dashboard_stats_spec.rb | 16 +++++++++--- .../shared_examples_for_stats_cacheable.rb | 25 +++++++++++-------- 7 files changed, 53 insertions(+), 38 deletions(-) delete mode 100644 app/jobs/stats.rb diff --git a/app/jobs/scheduled/about_stats.rb b/app/jobs/scheduled/about_stats.rb index d745f8a0d6..1ae2a0866a 100644 --- a/app/jobs/scheduled/about_stats.rb +++ b/app/jobs/scheduled/about_stats.rb @@ -1,13 +1,9 @@ module Jobs class AboutStats < Jobs::Scheduled - include Jobs::Stats - every 30.minutes def execute(args) - stats = About.new.stats - set_cache(About, stats) - stats + About.refresh_stats end end end diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb index b891b182a4..2b35fc4380 100644 --- a/app/jobs/scheduled/dashboard_stats.rb +++ b/app/jobs/scheduled/dashboard_stats.rb @@ -1,7 +1,5 @@ module Jobs class DashboardStats < Jobs::Scheduled - include Jobs::Stats - every 30.minutes def execute(args) @@ -12,9 +10,7 @@ module Jobs GroupMessage.create(Group[:admins].name, :dashboard_problems, {limit_once_per: 7.days.to_i}) end - stats = AdminDashboardData.fetch_stats - set_cache(AdminDashboardData, stats) - stats + AdminDashboardData.refresh_stats end end end diff --git a/app/jobs/stats.rb b/app/jobs/stats.rb deleted file mode 100644 index 637091cc6a..0000000000 --- a/app/jobs/stats.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Jobs - module Stats - def set_cache(klass, stats) - # Add some extra time to the expiry so that the next job run has plenty of time to - # finish before previous cached value expires. - $redis.setex klass.stats_cache_key, (klass.recalculate_stats_interval + 5).minutes, stats.to_json - end - end -end diff --git a/app/models/concerns/stats_cacheable.rb b/app/models/concerns/stats_cacheable.rb index d7364111f4..150c2a7b20 100644 --- a/app/models/concerns/stats_cacheable.rb +++ b/app/models/concerns/stats_cacheable.rb @@ -18,7 +18,22 @@ module StatsCacheable def fetch_cached_stats # The scheduled Stats job is responsible for generating and caching this. stats = $redis.get(stats_cache_key) - stats ? JSON.parse(stats) : nil + stats = refresh_stats if !stats + JSON.parse(stats).with_indifferent_access + end + + def refresh_stats + stats = fetch_stats.to_json + set_cache(stats) + stats + end + + private + + def set_cache(stats) + # Add some extra time to the expiry so that the next job run has plenty of time to + # finish before previous cached value expires. + $redis.setex stats_cache_key, (recalculate_stats_interval + 5).minutes, stats end end end diff --git a/spec/jobs/about_stats_spec.rb b/spec/jobs/about_stats_spec.rb index 25ae8291f8..85a1020e6d 100644 --- a/spec/jobs/about_stats_spec.rb +++ b/spec/jobs/about_stats_spec.rb @@ -1,10 +1,16 @@ require 'rails_helper' describe Jobs::AboutStats do + after do + $redis.flushall + end + it 'caches the stats' do - stats = { "visited" => 10 } - About.any_instance.expects(:stats).returns(stats) - $redis.expects(:setex).with(About.stats_cache_key, 35.minutes, stats.to_json) + stats = About.fetch_stats.to_json + cache_key = About.stats_cache_key + + expect($redis.get(cache_key)).to eq(nil) expect(described_class.new.execute({})).to eq(stats) + expect($redis.get(cache_key)).to eq(stats) end end diff --git a/spec/jobs/dashboard_stats_spec.rb b/spec/jobs/dashboard_stats_spec.rb index b00130d02d..82ff12edc6 100644 --- a/spec/jobs/dashboard_stats_spec.rb +++ b/spec/jobs/dashboard_stats_spec.rb @@ -1,10 +1,18 @@ require 'rails_helper' describe Jobs::DashboardStats do + after do + $redis.flushall + end + it 'caches the stats' do - json = { "visited" => 10 } - AdminDashboardData.any_instance.expects(:as_json).returns(json) - $redis.expects(:setex).with(AdminDashboardData.stats_cache_key, 35.minutes, json.to_json) - expect(described_class.new.execute({})).to eq(json) + Timecop.freeze do + stats = AdminDashboardData.fetch_stats.to_json + cache_key = AdminDashboardData.stats_cache_key + + expect($redis.get(cache_key)).to eq(nil) + expect(described_class.new.execute({})).to eq(stats) + expect($redis.get(cache_key)).to eq(stats) + end end end diff --git a/spec/support/shared_examples_for_stats_cacheable.rb b/spec/support/shared_examples_for_stats_cacheable.rb index d47877c582..b6a2b4dfef 100644 --- a/spec/support/shared_examples_for_stats_cacheable.rb +++ b/spec/support/shared_examples_for_stats_cacheable.rb @@ -1,22 +1,25 @@ shared_examples_for 'stats cachable' do describe 'fetch_cached_stats' do - it 'returns the cached stats' do - begin - stats = { "visits" => 10 } - $redis.set(described_class.stats_cache_key, stats.to_json) - expect(described_class.fetch_cached_stats).to eq(stats) - ensure - $redis.del(described_class.stats_cache_key) - end + after do + $redis.flushall end - it 'returns nil if no stats has been cached' do - expect(described_class.fetch_cached_stats).to eq(nil) + it 'returns the cached stats' do + stats = described_class.fetch_stats.to_json + $redis.set(described_class.stats_cache_key, stats) + expect(described_class.fetch_cached_stats).to eq(JSON.parse(stats)) + end + + it 'returns fetches the stats if stats has not been cached' do + Timecop.freeze do + $redis.del(described_class.stats_cache_key) + expect(described_class.fetch_cached_stats).to eq(JSON.parse(described_class.fetch_stats.to_json)) + end end end describe 'fetch_stats' do - it 'has been implemented' do + it 'has not been implemented' do expect{ described_class.fetch_stats }.to_not raise_error end end From a556d9ad4eb03ae8a90850a4808546d99a87c73b Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 21 Apr 2016 15:04:03 +0800 Subject: [PATCH 009/125] FIX: Expiry should be 3 times polling interval. --- app/jobs/scheduled/poll_mailbox.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb index 44dce2adbf..e79ad10edd 100644 --- a/app/jobs/scheduled/poll_mailbox.rb +++ b/app/jobs/scheduled/poll_mailbox.rb @@ -119,7 +119,11 @@ module Jobs end rescue Net::OpenTimeout => e count = $redis.incr(POLL_MAILBOX_TIMEOUT_ERROR_KEY).to_i - $redis.expire(POLL_MAILBOX_TIMEOUT_ERROR_KEY, 300) if count == 1 + + $redis.expire( + POLL_MAILBOX_TIMEOUT_ERROR_KEY, + SiteSetting.pop3_polling_period_mins.minutes * 3 + ) if count == 1 if count > 3 $redis.del(POLL_MAILBOX_TIMEOUT_ERROR_KEY) From cd4ffccb4a748ea4e40a19a56d3cf153d280664f Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 21 Apr 2016 16:09:21 +0800 Subject: [PATCH 010/125] Upgrade onebox. --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 19ac560327..bc0b32e390 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,7 +213,7 @@ GEM omniauth-twitter (1.2.1) json (~> 1.3) omniauth-oauth (~> 1.1) - onebox (1.5.38) + onebox (1.5.39) htmlentities (~> 4.3.4) moneta (~> 0.8) multi_json (~> 1.11) From 89a7a90208697da9240c52a208e8f9a912128522 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 21 Apr 2016 13:03:23 +0530 Subject: [PATCH 011/125] UX: do not show filter controls for PM admin reports --- .../admin/controllers/admin-reports.js.es6 | 5 +++++ app/assets/javascripts/admin/templates/reports.hbs | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 index 17d0c1243f..b07e3f69cd 100644 --- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 @@ -26,6 +26,11 @@ export default Ember.Controller.extend({ return arr.concat(this.site.groups.map((i) => {return {name: i['name'], value: i['id']};})); }, + @computed('model.type') + showFilterOptions(modelType) { + return !modelType.match(/_private_messages$/); + }, + @computed('model.type') showGroupOptions(modelType) { return modelType === "visits" || modelType === "signups" || modelType === "profile_views"; diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs index 7f0363a2f3..a3b6797f76 100644 --- a/app/assets/javascripts/admin/templates/reports.hbs +++ b/app/assets/javascripts/admin/templates/reports.hbs @@ -1,13 +1,15 @@

{{model.title}}

- {{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate}} - {{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate}} - {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}} - {{#if showGroupOptions}} - {{combo-box valueAttribute="value" content=groupOptions value=groupId}} + {{#if showFilterOptions}} + {{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate}} + {{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate}} + {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}} + {{#if showGroupOptions}} + {{combo-box valueAttribute="value" content=groupOptions value=groupId}} + {{/if}} + {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}} {{/if}} - {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}} {{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}
From ee7ef46b9e29fb01e74f0828163a116818253d4b Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 21 Apr 2016 14:52:41 +0530 Subject: [PATCH 012/125] FEATURE: support filter options for PM report --- .../admin/controllers/admin-reports.js.es6 | 2 +- app/assets/javascripts/admin/templates/reports.hbs | 14 +++++++------- app/models/post.rb | 4 ++-- app/models/report.rb | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 index b07e3f69cd..61b46740ac 100644 --- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 @@ -27,7 +27,7 @@ export default Ember.Controller.extend({ }, @computed('model.type') - showFilterOptions(modelType) { + showCategoryOptions(modelType) { return !modelType.match(/_private_messages$/); }, diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs index a3b6797f76..12303f27ef 100644 --- a/app/assets/javascripts/admin/templates/reports.hbs +++ b/app/assets/javascripts/admin/templates/reports.hbs @@ -1,15 +1,15 @@

{{model.title}}

- {{#if showFilterOptions}} - {{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate}} - {{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate}} + {{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate}} + {{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate}} + {{#if showCategoryOptions}} {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}} - {{#if showGroupOptions}} - {{combo-box valueAttribute="value" content=groupOptions value=groupId}} - {{/if}} - {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}} {{/if}} + {{#if showGroupOptions}} + {{combo-box valueAttribute="value" content=groupOptions value=groupId}} + {{/if}} + {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}} {{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}
diff --git a/app/models/post.rb b/app/models/post.rb index 83c669fe49..df3d51ed24 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -557,8 +557,8 @@ class Post < ActiveRecord::Base result.group('date(posts.created_at)').order('date(posts.created_at)').count end - def self.private_messages_count_per_day(since_days_ago, topic_subtype) - private_posts.with_topic_subtype(topic_subtype).where('posts.created_at > ?', since_days_ago.days.ago).group('date(posts.created_at)').order('date(posts.created_at)').count + def self.private_messages_count_per_day(start_date, end_date, topic_subtype) + private_posts.with_topic_subtype(topic_subtype).where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date).group('date(posts.created_at)').order('date(posts.created_at)').count end def reply_history(max_replies=100, guardian=nil) diff --git a/app/models/report.rb b/app/models/report.rb index e5135dcacf..ecb7c27f3b 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -205,7 +205,7 @@ class Report # Private messages counts: def self.private_messages_report(report, topic_subtype) - basic_report_about report, Post, :private_messages_count_per_day, default_days, topic_subtype + basic_report_about report, Post, :private_messages_count_per_day, report.start_date, report.end_date, topic_subtype add_counts report, Post.private_posts.with_topic_subtype(topic_subtype), 'posts.created_at' end From ded03a1aa4ebf72d73187e7214f72fc57a9a8dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 21 Apr 2016 20:56:12 +0200 Subject: [PATCH 013/125] ensure pikaday respects our color scheme --- .../discourse/components/date-picker.js.es6 | 34 ++++++++------- .../templates/components/date-picker.hbs | 2 +- .../templates/modal/change-timestamp.hbs | 6 ++- app/assets/stylesheets/desktop/modal.scss | 16 +++++++ app/assets/stylesheets/vendor/pikaday.scss | 42 ++++++++++--------- 5 files changed, 62 insertions(+), 38 deletions(-) diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6 index 21825d2ed8..ea86648784 100644 --- a/app/assets/javascripts/discourse/components/date-picker.js.es6 +++ b/app/assets/javascripts/discourse/components/date-picker.js.es6 @@ -9,24 +9,28 @@ export default Em.Component.extend({ @on("didInsertElement") _loadDatePicker() { const input = this.$(".date-picker")[0]; + const container = $("#" + this.get("containerId"))[0]; loadScript("/javascripts/pikaday.js").then(() => { - let default_opts = { - field: input, - container: this.$()[0], - format: "YYYY-MM-DD", - firstDay: moment.localeData().firstDayOfWeek(), - i18n: { - previousMonth: I18n.t('dates.previous_month'), - nextMonth: I18n.t('dates.next_month'), - months: moment.months(), - weekdays: moment.weekdays(), - weekdaysShort: moment.weekdaysShort() - }, - onSelect: date => this.set("value", moment(date).format("YYYY-MM-DD")) - }; + Ember.run.next(() => { + let default_opts = { + field: input, + container: container || this.$()[0], + bound: container === undefined, + format: "YYYY-MM-DD", + firstDay: moment.localeData().firstDayOfWeek(), + i18n: { + previousMonth: I18n.t('dates.previous_month'), + nextMonth: I18n.t('dates.next_month'), + months: moment.months(), + weekdays: moment.weekdays(), + weekdaysShort: moment.weekdaysShort() + }, + onSelect: date => this.set("value", moment(date).format("YYYY-MM-DD")) + }; - this._picker = new Pikaday(_.merge(default_opts, this._opts())); + this._picker = new Pikaday(_.merge(default_opts, this._opts())); + }); }); }, diff --git a/app/assets/javascripts/discourse/templates/components/date-picker.hbs b/app/assets/javascripts/discourse/templates/components/date-picker.hbs index 7d9e48080a..a2c89401ab 100644 --- a/app/assets/javascripts/discourse/templates/components/date-picker.hbs +++ b/app/assets/javascripts/discourse/templates/components/date-picker.hbs @@ -1 +1 @@ - + diff --git a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs index c76c58e124..5114bd9cf9 100644 --- a/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs +++ b/app/assets/javascripts/discourse/templates/modal/change-timestamp.hbs @@ -1,4 +1,4 @@ -
+

{{i18n 'topic.change_timestamp.instructions'}}

@@ -8,9 +8,11 @@

- {{input type="date" value=date}} + {{date-picker-past value=date containerId="date-container"}} {{input type="time" value=time}}
+ +
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 82a1ee16f4..cf4902e5af 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -196,3 +196,19 @@ width: 400px; } } + +.change-timestamp { + min-height: 300px; + + .date-picker { + width: 10em; + } + + input[type=time] { + width: 6em; + } + + form { + margin: 0; + } +} diff --git a/app/assets/stylesheets/vendor/pikaday.scss b/app/assets/stylesheets/vendor/pikaday.scss index 90799a4ea4..646f08ed05 100644 --- a/app/assets/stylesheets/vendor/pikaday.scss +++ b/app/assets/stylesheets/vendor/pikaday.scss @@ -1,3 +1,5 @@ +@import "common/foundation/variables"; + /*! * Pikaday * Copyright © 2014 David Bushell | BSD & MIT license | http://dbushell.com/ @@ -8,24 +10,24 @@ // Variables are namespaced with the pd (pikaday) prefix // Colours -$pd-text-color: #333 !default; -$pd-title-color: #333 !default; -$pd-title-bg: #fff !default; -$pd-picker-bg: #fff !default; -$pd-picker-border: #ccc !default; -$pd-picker-border-bottom: #bbb !default; +$pd-text-color: $primary !default; +$pd-title-color: $primary !default; +$pd-title-bg: $secondary !default; +$pd-picker-bg: $secondary !default; +$pd-picker-border: dark-light-diff($secondary, $primary, -20%, 20%) !default; +$pd-picker-border-bottom: dark-light-diff($secondary, $primary, -30%, 30%) !default; $pd-picker-shadow: rgba(0,0,0,.5) !default; -$pd-th-color: #999 !default; -$pd-day-color: #666 !default; -$pd-day-bg: #f5f5f5 !default; -$pd-day-hover-color: #fff !default; -$pd-day-hover-bg: #ff8000 !default; -$pd-day-today-color: #33aaff !default; -$pd-day-selected-color: #fff !default; -$pd-day-selected-bg: #33aaff !default; -$pd-day-selected-shadow: #178fe5 !default; -$pd-day-disabled-color: #999 !default; -$pd-week-color: #999 !default; +$pd-th-color: dark-light-diff($primary, $secondary, -20%, 20%) !default; +$pd-day-color: dark-light-diff($primary, $secondary, -30%, 30%) !default; +$pd-day-bg: dark-light-diff($primary, $secondary, 90%, -90%) !default; +$pd-day-hover-color: $secondary !default; +$pd-day-hover-bg: dark-light-diff($tertiary, $secondary, 30%, -30%) !default; +$pd-day-today-color: $tertiary !default; +$pd-day-selected-color: $secondary !default; +$pd-day-selected-bg: $tertiary !default; +$pd-day-selected-shadow: dark-light-diff($tertiary, $secondary, 50%, -50%) !default; +$pd-day-disabled-color: dark-light-diff($primary, $secondary, -20%, 20%) !default; +$pd-week-color: dark-light-diff($primary, $secondary, -20%, 20%) !default; // Font $pd-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default; @@ -233,15 +235,15 @@ $pd-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default; } .is-startrange .pika-button { - color: #fff; + color: $secondary; background: #6CB31D; box-shadow: none; border-radius: 3px; } .is-endrange .pika-button { - color: #fff; - background: #33aaff; + color: $secondary; + background: $tertiary; box-shadow: none; border-radius: 3px; } From 56adc0108131a2ed22d0159fbf50489244605e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 21 Apr 2016 21:00:28 +0200 Subject: [PATCH 014/125] fix last-seen date position in digest preview --- app/assets/stylesheets/common/admin/admin_base.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 414bffb784..10460fd6cc 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -282,7 +282,7 @@ td.flaggers td { display: inline-block; margin-right: 5px; } - #last-seen { + #last-seen input[type="text"] { float: none; } .ac-wrap { From 72761ab938555a16a0634ac1a522b20599692f7a Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 21 Apr 2016 13:53:26 -0700 Subject: [PATCH 015/125] we don't need to specify default email port... --- docs/INSTALL-email.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md index ee499ad470..175764220d 100644 --- a/docs/INSTALL-email.md +++ b/docs/INSTALL-email.md @@ -10,7 +10,6 @@ Use these values when you [edit your Discourse `app.yml` configuration file](htt ```yml DISCOURSE_SMTP_ADDRESS: smtp.sparkpostmail.com -DISCOURSE_SMTP_PORT: 587 DISCOURSE_SMTP_USER_NAME: SMTP_Injection DISCOURSE_SMTP_PASSWORD: [Any API key with Send via SMTP permission] ``` @@ -25,7 +24,6 @@ If not using **the exact** domain you verified (e.g. you're using a subdomain of ```yml DISCOURSE_SMTP_ADDRESS: smtp.sendgrid.net -DISCOURSE_SMTP_PORT: 587 DISCOURSE_SMTP_USER_NAME: apikey DISCOURSE_SMTP_PASSWORD: [SendGrid API Key] ``` @@ -36,7 +34,6 @@ We recommend creating an [API Key][sg2] instead of using your SendGrid username ```yml DISCOURSE_SMTP_ADDRESS: smtp.mailgun.org -DISCOURSE_SMTP_PORT: 587 DISCOURSE_SMTP_USER_NAME: [SMTP credentials for your domain under Mailgun domains tab] DISCOURSE_SMTP_PASSWORD: [SMTP credentials for your domain under Mailgun domains tab] ``` From ed446ca4876639f6bfc7b064c2e3deb85da9f4c1 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 21 Apr 2016 16:52:12 -0700 Subject: [PATCH 016/125] increase transpiler timeout to 15 sec --- .../tilt/es6_module_transpiler_template.rb | 3 ++- lib/pretty_text.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb index f827746ea7..58eb0e678c 100644 --- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb +++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb @@ -29,7 +29,8 @@ module Tilt end def self.create_new_context - ctx = V8::Context.new(timeout: 10000) + # timeout any eval that takes longer than 15 seconds + ctx = V8::Context.new(timeout: 15000) ctx.eval("var self = this; #{File.read(Babel::Transpiler.script_path)}") ctx.eval("module = {}; exports = {};"); ctx.load("#{Rails.root}/lib/es6_module_transpiler/support/es6-module-transpiler.js") diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index d72496074c..bc804a1613 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -77,8 +77,8 @@ module PrettyText end def self.create_new_context - # timeout any eval that takes longer that 5 seconds - ctx = V8::Context.new(timeout: 10000) + # timeout any eval that takes longer than 15 seconds + ctx = V8::Context.new(timeout: 15000) ctx["helpers"] = Helpers.new From 53b2b02527162e5ad31fcb8063d71f55071ae460 Mon Sep 17 00:00:00 2001 From: John Britton Date: Fri, 22 Apr 2016 11:15:56 +0100 Subject: [PATCH 017/125] Update Google Ajax-Crawling API documentation url --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 966723f90f..ffb0b9020f 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -893,7 +893,7 @@ en: ga_domain_name: "Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see http://google.com/analytics" - enable_escaped_fragments: "Fall back to Google's Ajax-Crawling API if no webcrawler is detected. See https://support.google.com/webmasters/answer/174992?hl=en" + enable_escaped_fragments: "Fall back to Google's Ajax-Crawling API if no webcrawler is detected. See https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" enable_noscript_support: "Enable standard webcrawler search engine support via the noscript tag" allow_moderators_to_create_categories: "Allow moderators to create new categories" cors_origins: "Allowed origins for cross-origin requests (CORS). Each origin must include http:// or https://. The DISCOURSE_ENABLE_CORS env variable must be set to true to enable CORS." From f1bc7de541443b8e4ca8bb2115f4651f2cb82343 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Fri, 15 Apr 2016 23:26:18 +0200 Subject: [PATCH 018/125] Adds support for anonymous votes to the poll plugin --- plugins/poll/plugin.rb | 15 ++++++++++--- .../spec/controllers/polls_controller_spec.rb | 13 +++++++++++ .../spec/controllers/posts_controller_spec.rb | 22 ++++++++++++++++++- plugins/poll/spec/helpers.rb | 17 ++++++++++++++ 4 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 plugins/poll/spec/helpers.rb diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb index 82d271b7a8..977be892fa 100644 --- a/plugins/poll/plugin.rb +++ b/plugins/poll/plugin.rb @@ -61,7 +61,7 @@ after_initialize do raise StandardError.new I18n.t("poll.requires_at_least_1_valid_option") if options.empty? - poll["voters"] = 0 + poll["voters"] = poll["anonymous_voters"] || 0 all_options = Hash.new(0) post.custom_fields[VOTES_CUSTOM_FIELD] ||= {} @@ -74,7 +74,10 @@ after_initialize do poll["voters"] += 1 if (available_options & votes.to_set).size > 0 end - poll["options"].each { |o| o["votes"] = all_options[o["id"]] } + poll["options"].each do |option| + anonymous_votes = option["anonymous_votes"] || 0 + option["votes"] = all_options[option["id"]] + anonymous_votes + end post.custom_fields[POLLS_CUSTOM_FIELD] = polls post.save_custom_fields(true) @@ -327,8 +330,14 @@ after_initialize do end polls[poll_name]["voters"] = previous_polls[poll_name]["voters"] + polls[poll_name]["anonymous_voters"] = previous_polls[poll_name]["anonymous_voters"] if previous_polls[poll_name].has_key?("anonymous_voters") + for o in 0...polls[poll_name]["options"].size - polls[poll_name]["options"][o]["votes"] = previous_polls[poll_name]["options"][o]["votes"] + current_option = polls[poll_name]["options"][o] + previous_option = previous_polls[poll_name]["options"][o] + + current_option["votes"] = previous_option["votes"] + current_option["anonymous_votes"] = previous_option["anonymous_votes"] if previous_option.has_key?("anonymous_votes") end end diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb index b1679d7d6e..8a8ce7190e 100644 --- a/plugins/poll/spec/controllers/polls_controller_spec.rb +++ b/plugins/poll/spec/controllers/polls_controller_spec.rb @@ -1,4 +1,5 @@ require "rails_helper" +require_relative "../helpers" describe ::DiscoursePoll::PollsController do routes { ::DiscoursePoll::Engine.routes } @@ -85,6 +86,18 @@ describe ::DiscoursePoll::PollsController do expect(json["errors"][0]).to eq(I18n.t("poll.poll_must_be_open_to_vote")) end + it "doesn't discard anonymous votes when someone votes" do + default_poll = poll.custom_fields["polls"]["poll"] + add_anonymous_votes(poll, default_poll, 17, {"5c24fc1df56d764b550ceae1b9319125" => 11, "e89dec30bbd9bf50fabf6a05b4324edf" => 6}) + + xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] } + expect(response).to be_success + + json = ::JSON.parse(response.body) + expect(json["poll"]["voters"]).to eq(18) + expect(json["poll"]["options"][0]["votes"]).to eq(12) + expect(json["poll"]["options"][1]["votes"]).to eq(6) + end end describe "#toggle_status" do diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb index bc86459637..990ead74d8 100644 --- a/plugins/poll/spec/controllers/posts_controller_spec.rb +++ b/plugins/poll/spec/controllers/posts_controller_spec.rb @@ -1,4 +1,5 @@ require "rails_helper" +require_relative "../helpers" describe PostsController do let!(:user) { log_in } @@ -165,12 +166,31 @@ describe PostsController do expect(json["errors"][0]).to eq(I18n.t("poll.op_cannot_edit_options_after_5_minutes")) end - it "staff can change the options" do + it "staff can change the options and votes are merged" do log_in_user(Fabricate(:moderator)) xhr :put, :update, { id: post_id, post: { raw: new_option } } expect(response).to be_success json = ::JSON.parse(response.body) expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C") + expect(json["post"]["polls"]["poll"]["voters"]).to eq(1) + expect(json["post"]["polls"]["poll"]["options"][0]["votes"]).to eq(1) + expect(json["post"]["polls"]["poll"]["options"][1]["votes"]).to eq(0) + end + + it "staff can change the options and anonymous votes are merged" do + post = Post.find_by(id: post_id) + default_poll = post.custom_fields["polls"]["poll"] + add_anonymous_votes(post, default_poll, 7, {"5c24fc1df56d764b550ceae1b9319125" => 7}) + + log_in_user(Fabricate(:moderator)) + xhr :put, :update, { id: post_id, post: { raw: new_option } } + expect(response).to be_success + + json = ::JSON.parse(response.body) + expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C") + expect(json["post"]["polls"]["poll"]["voters"]).to eq(8) + expect(json["post"]["polls"]["poll"]["options"][0]["votes"]).to eq(8) + expect(json["post"]["polls"]["poll"]["options"][1]["votes"]).to eq(0) end it "support changes on the post" do diff --git a/plugins/poll/spec/helpers.rb b/plugins/poll/spec/helpers.rb new file mode 100644 index 0000000000..a0584810ab --- /dev/null +++ b/plugins/poll/spec/helpers.rb @@ -0,0 +1,17 @@ +module Helpers + def add_anonymous_votes(post, poll, voters, options_with_votes) + poll["voters"] += voters + poll["anonymous_voters"] = voters + + poll["options"].each do |option| + anonymous_votes = options_with_votes[option["id"]] || 0 + + if anonymous_votes > 0 + option["votes"] += anonymous_votes + option["anonymous_votes"] = anonymous_votes + end + end + + post.save_custom_fields(true) + end +end From a796289b3a94c40b8ad800ff1760157b27ca572d Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Sat, 23 Apr 2016 22:42:25 +0200 Subject: [PATCH 019/125] Fix import of polls from phpBB3 --- .../phpbb3/database/database_3_0.rb | 37 +++++++--- .../phpbb3/importers/poll_importer.rb | 72 +++++++++---------- 2 files changed, 61 insertions(+), 48 deletions(-) diff --git a/script/import_scripts/phpbb3/database/database_3_0.rb b/script/import_scripts/phpbb3/database/database_3_0.rb index b25395abad..99df944e23 100644 --- a/script/import_scripts/phpbb3/database/database_3_0.rb +++ b/script/import_scripts/phpbb3/database/database_3_0.rb @@ -95,33 +95,50 @@ module ImportScripts::PhpBB3 def fetch_poll_options(topic_id) query(<<-SQL) - SELECT poll_option_id, poll_option_text, poll_option_total - FROM #{@table_prefix}_poll_options - WHERE topic_id = #{topic_id} - ORDER BY poll_option_id + SELECT o.poll_option_id, o.poll_option_text, o.poll_option_total AS total_votes, + o.poll_option_total - ( + SELECT COUNT(DISTINCT v.vote_user_id) + FROM #{@table_prefix}_poll_votes v + JOIN #{@table_prefix}_users u ON (v.vote_user_id = u.user_id) + JOIN #{@table_prefix}_topics t ON (v.topic_id = t.topic_id) + WHERE v.poll_option_id = o.poll_option_id AND v.topic_id = o.topic_id + ) AS anonymous_votes + FROM #{@table_prefix}_poll_options o + WHERE o.topic_id = #{topic_id} + ORDER BY o.poll_option_id SQL end def fetch_poll_votes(topic_id) - # this query ignores votes from users that do not exist anymore + # this query ignores invalid votes that belong to non-existent users or topics query(<<-SQL) SELECT u.user_id, v.poll_option_id FROM #{@table_prefix}_poll_votes v + JOIN #{@table_prefix}_poll_options o ON (v.poll_option_id = o.poll_option_id AND v.topic_id = o.topic_id) JOIN #{@table_prefix}_users u ON (v.vote_user_id = u.user_id) + JOIN #{@table_prefix}_topics t ON (v.topic_id = t.topic_id) WHERE v.topic_id = #{topic_id} SQL end - def count_voters(topic_id) + def get_voters(topic_id) # anonymous voters can't be counted, but lets try to make the count look "correct" anyway - count(<<-SQL) - SELECT MAX(count) AS count + query(<<-SQL).first + SELECT MAX(x.total_voters) AS total_voters, + MAX(x.total_voters) - ( + SELECT COUNT(DISTINCT v.vote_user_id) + FROM #{@table_prefix}_poll_votes v + JOIN #{@table_prefix}_poll_options o ON (v.poll_option_id = o.poll_option_id AND v.topic_id = o.topic_id) + JOIN #{@table_prefix}_users u ON (v.vote_user_id = u.user_id) + JOIN #{@table_prefix}_topics t ON (v.topic_id = t.topic_id) + WHERE v.topic_id = #{topic_id} + ) AS anonymous_voters FROM ( - SELECT COUNT(DISTINCT vote_user_id) AS count + SELECT COUNT(DISTINCT vote_user_id) AS total_voters FROM #{@table_prefix}_poll_votes WHERE topic_id = #{topic_id} UNION - SELECT MAX(poll_option_total) AS count + SELECT MAX(poll_option_total) AS total_voters FROM #{@table_prefix}_poll_options WHERE topic_id = #{topic_id} ) x diff --git a/script/import_scripts/phpbb3/importers/poll_importer.rb b/script/import_scripts/phpbb3/importers/poll_importer.rb index e6bae5b40b..da3e1d0b65 100644 --- a/script/import_scripts/phpbb3/importers/poll_importer.rb +++ b/script/import_scripts/phpbb3/importers/poll_importer.rb @@ -24,15 +24,17 @@ module ImportScripts::PhpBB3 return if extracted_poll.nil? - update_poll(extracted_poll, options, topic_id, poll) + update_poll_metadata(extracted_poll, topic_id, poll) + update_poll_options(extracted_poll, options, poll) mapped_poll = { raw: poll_text, custom_fields: {} } - add_polls_field(mapped_poll[:custom_fields], extracted_poll) - add_vote_fields(mapped_poll[:custom_fields], topic_id, poll) + add_poll_to_custom_fields(mapped_poll[:custom_fields], extracted_poll) + add_votes_to_custom_fields(mapped_poll[:custom_fields], topic_id, poll) + mapped_poll end @@ -40,23 +42,17 @@ module ImportScripts::PhpBB3 def get_poll_options(topic_id) rows = @database.fetch_poll_options(topic_id) - options_by_text = {} + options_by_text = Hash.new { |h, k| h[k] = {ids: [], total_votes: 0, anonymous_votes: 0} } rows.each do |row| option_text = @text_processor.process_raw_text(row[:poll_option_text]).delete("\n") - if options_by_text.key?(option_text) - # phpBB allows duplicate options (why?!) - we need to merge them - option = options_by_text[option_text] - option[:ids] << row[:poll_option_id] - option[:votes] += row[:poll_option_total] - else - options_by_text[option_text] = { - ids: [row[:poll_option_id]], - text: option_text, - votes: row[:poll_option_total] - } - end + # phpBB allows duplicate options (why?!) - we need to merge them + option = options_by_text[option_text] + option[:ids] << row[:poll_option_id] + option[:text] = option_text + option[:total_votes] += row[:total_votes] + option[:anonymous_votes] += row[:anonymous_votes] end options_by_text.values @@ -91,47 +87,47 @@ module ImportScripts::PhpBB3 end # @param poll [ImportScripts::PhpBB3::Poll] - def update_poll(default_poll, imported_options, topic_id, poll) - default_poll['voters'] = @database.count_voters(topic_id) # this includes anonymous voters - default_poll['status'] = poll.has_ended? ? :open : :closed + def update_poll_metadata(extracted_poll, topic_id, poll) + row = @database.get_voters(topic_id) - default_poll['options'].each_with_index do |option, index| + extracted_poll['voters'] = row[:total_voters] + extracted_poll['anonymous_voters'] = row[:anonymous_voters] if row[:anonymous_voters] > 0 + extracted_poll['status'] = poll.has_ended? ? :open : :closed + end + + # @param poll [ImportScripts::PhpBB3::Poll] + def update_poll_options(extracted_poll, imported_options, poll) + extracted_poll['options'].each_with_index do |option, index| imported_option = imported_options[index] - option['votes'] = imported_option[:votes] + option['votes'] = imported_option[:total_votes] + option['anonymous_votes'] = imported_option[:anonymous_votes] if imported_option[:anonymous_votes] > 0 poll.add_option_id(imported_option[:ids], option['id']) end end - def add_polls_field(custom_fields, default_poll) - custom_fields[@polls_field] = {@default_poll_name => default_poll} + # @param custom_fields [Hash] + def add_poll_to_custom_fields(custom_fields, extracted_poll) + custom_fields[@polls_field] = {@default_poll_name => extracted_poll} end # @param custom_fields [Hash] # @param poll [ImportScripts::PhpBB3::Poll] - def add_vote_fields(custom_fields, topic_id, poll) + def add_votes_to_custom_fields(custom_fields, topic_id, poll) rows = @database.fetch_poll_votes(topic_id) - warned = false + votes = {} rows.each do |row| option_id = poll.option_id_from_imported_option_id(row[:poll_option_id]) user_id = @lookup.user_id_from_imported_user_id(row[:user_id]) if option_id.present? && user_id.present? - key = "#{@votes_field}-#{user_id}" - - if custom_fields.key?(key) - votes = custom_fields[key][@default_poll_name] - else - votes = [] - custom_fields[key] = {@default_poll_name => votes} - end - - votes << option_id - elsif !warned - warned = true - Rails.logger.warn("Topic with id #{topic_id} has invalid votes.") + user_votes = votes["#{user_id}"] ||= {} + user_votes = user_votes[@default_poll_name] ||= [] + user_votes << option_id end end + + custom_fields[@votes_field] = votes end end From e19ee93ee3ecc70d4811c498a0ddcdadb0aabfeb Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Thu, 14 Jan 2016 22:43:19 +0100 Subject: [PATCH 020/125] Stop using OFFSET in DB queries of phpBB3 importer http://use-the-index-luke.com/no-offset --- .../phpbb3/database/database_3_0.rb | 56 +++++++++---------- .../phpbb3/database/database_3_1.rb | 5 +- .../phpbb3/database/database_base.rb | 27 ++++++++- script/import_scripts/phpbb3/importer.rb | 15 +++-- 4 files changed, 65 insertions(+), 38 deletions(-) diff --git a/script/import_scripts/phpbb3/database/database_3_0.rb b/script/import_scripts/phpbb3/database/database_3_0.rb index b25395abad..4c750c2de7 100644 --- a/script/import_scripts/phpbb3/database/database_3_0.rb +++ b/script/import_scripts/phpbb3/database/database_3_0.rb @@ -12,8 +12,8 @@ module ImportScripts::PhpBB3 SQL end - def fetch_users(offset) - query(<<-SQL) + def fetch_users(last_user_id) + query(<<-SQL, :user_id) SELECT u.user_id, u.user_email, u.username, u.user_password, u.user_regdate, u.user_lastvisit, u.user_ip, u.user_type, u.user_inactive_reason, g.group_name, b.ban_start, b.ban_end, b.ban_reason, u.user_posts, u.user_website, u.user_from, u.user_birthday, u.user_avatar_type, u.user_avatar @@ -23,10 +23,9 @@ module ImportScripts::PhpBB3 u.user_id = b.ban_userid AND b.ban_exclude = 0 AND (b.ban_end = 0 OR b.ban_end >= UNIX_TIMESTAMP()) ) - WHERE u.user_type != #{Constants::USER_TYPE_IGNORE} - ORDER BY u.user_id ASC + WHERE u.user_id > #{last_user_id} AND u.user_type != #{Constants::USER_TYPE_IGNORE} + ORDER BY u.user_id LIMIT #{@batch_size} - OFFSET #{offset} SQL end @@ -38,15 +37,16 @@ module ImportScripts::PhpBB3 SQL end - def fetch_anonymous_users(offset) - query(<<-SQL) + def fetch_anonymous_users(last_username) + last_username = escape(last_username) + + query(<<-SQL, :post_username) SELECT post_username, MIN(post_time) AS first_post_time FROM #{@table_prefix}_posts - WHERE post_username <> '' + WHERE post_username > '#{last_username}' GROUP BY post_username - ORDER BY post_username ASC + ORDER BY post_username LIMIT #{@batch_size} - OFFSET #{offset} SQL end @@ -60,7 +60,7 @@ module ImportScripts::PhpBB3 GROUP BY forum_id ) x ON (f.forum_id = x.forum_id) WHERE f.forum_type != #{Constants::FORUM_TYPE_LINK} - ORDER BY f.parent_id ASC, f.left_id ASC + ORDER BY f.parent_id, f.left_id SQL end @@ -71,17 +71,17 @@ module ImportScripts::PhpBB3 SQL end - def fetch_posts(offset) - query(<<-SQL) + def fetch_posts(last_post_id) + query(<<-SQL, :post_id) SELECT p.post_id, p.topic_id, t.forum_id, t.topic_title, t.topic_first_post_id, p.poster_id, p.post_text, p.post_time, p.post_username, t.topic_status, t.topic_type, t.poll_title, CASE WHEN t.poll_length > 0 THEN t.poll_start + t.poll_length ELSE NULL END AS poll_end, t.poll_max_options, p.post_attachment FROM #{@table_prefix}_posts p JOIN #{@table_prefix}_topics t ON (p.topic_id = t.topic_id) - ORDER BY p.post_id ASC + WHERE p.post_id > #{last_post_id} + ORDER BY p.post_id LIMIT #{@batch_size} - OFFSET #{offset} SQL end @@ -140,7 +140,7 @@ module ImportScripts::PhpBB3 SELECT physical_filename, real_filename FROM #{@table_prefix}_attachments WHERE topic_id = #{topic_id} AND post_msg_id = #{post_id} - ORDER BY filetime DESC, post_msg_id ASC + ORDER BY filetime DESC, post_msg_id SQL end @@ -158,9 +158,9 @@ module ImportScripts::PhpBB3 end end - def fetch_messages(use_fixed_messages, offset) + def fetch_messages(use_fixed_messages, last_msg_id) if use_fixed_messages - query(<<-SQL) + query(<<-SQL, :msg_id) SELECT m.msg_id, i.root_msg_id, m.author_id, m.message_time, m.message_subject, m.message_text, IFNULL(a.attachment_count, 0) AS attachment_count FROM #{@table_prefix}_privmsgs m @@ -171,12 +171,12 @@ module ImportScripts::PhpBB3 WHERE topic_id = 0 GROUP BY post_msg_id ) a ON (m.msg_id = a.post_msg_id) - ORDER BY i.root_msg_id ASC, m.msg_id ASC + WHERE m.msg_id > #{last_msg_id} + ORDER BY i.root_msg_id, m.msg_id LIMIT #{@batch_size} - OFFSET #{offset} SQL else - query(<<-SQL) + query(<<-SQL, :msg_id) SELECT m.msg_id, m.root_level AS root_msg_id, m.author_id, m.message_time, m.message_subject, m.message_text, IFNULL(a.attachment_count, 0) AS attachment_count FROM #{@table_prefix}_privmsgs m @@ -186,9 +186,9 @@ module ImportScripts::PhpBB3 WHERE topic_id = 0 GROUP BY post_msg_id ) a ON (m.msg_id = a.post_msg_id) - ORDER BY m.root_level ASC, m.msg_id ASC + WHERE m.msg_id > #{last_msg_id} + ORDER BY m.root_level, m.msg_id LIMIT #{@batch_size} - OFFSET #{offset} SQL end end @@ -229,14 +229,14 @@ module ImportScripts::PhpBB3 SQL end - def fetch_bookmarks(offset) - query(<<-SQL) + def fetch_bookmarks(last_user_id, last_topic_id) + query(<<-SQL, :user_id, :topic_first_post_id) SELECT b.user_id, t.topic_first_post_id FROM #{@table_prefix}_bookmarks b JOIN #{@table_prefix}_topics t ON (b.topic_id = t.topic_id) - ORDER BY b.user_id ASC, b.topic_id ASC + WHERE b.user_id > #{last_user_id} AND b.topic_id > #{last_topic_id} + ORDER BY b.user_id, b.topic_id LIMIT #{@batch_size} - OFFSET #{offset} SQL end @@ -322,7 +322,7 @@ module ImportScripts::PhpBB3 AND b.normalized_subject = i.normalized_subject AND a.msg_id <> m.msg_id AND a.message_time < m.message_time - ORDER BY a.message_time ASC + ORDER BY a.message_time LIMIT 1 ), 0) ELSE i.root_msg_id END AS root_msg_id FROM #{@table_prefix}_privmsgs m diff --git a/script/import_scripts/phpbb3/database/database_3_1.rb b/script/import_scripts/phpbb3/database/database_3_1.rb index 2dfc5054a8..c9368edf33 100644 --- a/script/import_scripts/phpbb3/database/database_3_1.rb +++ b/script/import_scripts/phpbb3/database/database_3_1.rb @@ -3,7 +3,7 @@ require_relative '../support/constants' module ImportScripts::PhpBB3 class Database_3_1 < Database_3_0 - def fetch_users(offset) + def fetch_users(last_user_id) query(<<-SQL) SELECT u.user_id, u.user_email, u.username, CASE WHEN u.user_password LIKE '$2y$%' @@ -20,10 +20,9 @@ module ImportScripts::PhpBB3 u.user_id = b.ban_userid AND b.ban_exclude = 0 AND (b.ban_end = 0 OR b.ban_end >= UNIX_TIMESTAMP()) ) - WHERE u.user_type != #{Constants::USER_TYPE_IGNORE} + WHERE u.user_id > #{last_user_id} AND u.user_type != #{Constants::USER_TYPE_IGNORE} ORDER BY u.user_id ASC LIMIT #{@batch_size} - OFFSET #{offset} SQL end end diff --git a/script/import_scripts/phpbb3/database/database_base.rb b/script/import_scripts/phpbb3/database/database_base.rb index a63cecf4c2..fa8cb3d454 100644 --- a/script/import_scripts/phpbb3/database/database_base.rb +++ b/script/import_scripts/phpbb3/database/database_base.rb @@ -12,13 +12,36 @@ module ImportScripts::PhpBB3 protected # Executes a database query. - def query(sql) - @database_client.query(sql, cache_rows: true, symbolize_keys: true) + def query(sql, *last_columns) + rows = @database_client.query(sql, cache_rows: true, symbolize_keys: true) + return rows if last_columns.length == 0 + + result = [rows] + last_row = find_last_row(rows) + + last_columns.each { |column| result.push(last_row ? last_row[column] : nil) } + result end # Executes a database query and returns the value of the 'count' column. def count(sql) query(sql).first[:count] end + + def escape(value) + @database_client.escape(value) + end + + private + + def find_last_row(rows) + last_index = rows.size - 1 + + rows.each_with_index do |row, index| + return row if index == last_index + end + + nil + end end end diff --git a/script/import_scripts/phpbb3/importer.rb b/script/import_scripts/phpbb3/importer.rb index d0e39eea14..b0c46c870a 100644 --- a/script/import_scripts/phpbb3/importer.rb +++ b/script/import_scripts/phpbb3/importer.rb @@ -57,9 +57,10 @@ module ImportScripts::PhpBB3 puts '', 'creating users' total_count = @database.count_users importer = @importers.user_importer + last_user_id = 0 batches do |offset| - rows = @database.fetch_users(offset) + rows, last_user_id = @database.fetch_users(last_user_id) break if rows.size < 1 next if all_records_exist?(:users, importer.map_users_to_import_ids(rows)) @@ -74,9 +75,10 @@ module ImportScripts::PhpBB3 puts '', 'creating anonymous users' total_count = @database.count_anonymous_users importer = @importers.user_importer + last_username = '' batches do |offset| - rows = @database.fetch_anonymous_users(offset) + rows, last_username = @database.fetch_anonymous_users(last_username) break if rows.size < 1 next if all_records_exist?(:users, importer.map_anonymous_users_to_import_ids(rows)) @@ -101,9 +103,10 @@ module ImportScripts::PhpBB3 puts '', 'creating topics and posts' total_count = @database.count_posts importer = @importers.post_importer + last_post_id = 0 batches do |offset| - rows = @database.fetch_posts(offset) + rows, last_post_id = @database.fetch_posts(last_post_id) break if rows.size < 1 next if all_records_exist?(:posts, importer.map_to_import_ids(rows)) @@ -123,9 +126,10 @@ module ImportScripts::PhpBB3 puts '', 'creating private messages' total_count = @database.count_messages(@settings.fix_private_messages) importer = @importers.message_importer + last_msg_id = 0 batches do |offset| - rows = @database.fetch_messages(@settings.fix_private_messages, offset) + rows, last_msg_id = @database.fetch_messages(@settings.fix_private_messages, last_msg_id) break if rows.size < 1 next if all_records_exist?(:posts, importer.map_to_import_ids(rows)) @@ -140,9 +144,10 @@ module ImportScripts::PhpBB3 puts '', 'creating bookmarks' total_count = @database.count_bookmarks importer = @importers.bookmark_importer + last_user_id = last_topic_id = 0 batches do |offset| - rows = @database.fetch_bookmarks(offset) + rows, last_user_id, last_topic_id = @database.fetch_bookmarks(last_user_id, last_topic_id) break if rows.size < 1 create_bookmarks(rows, total: total_count, offset: offset) do |row| From bb10697c508948a358f4757d11129a640191c9ad Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Sun, 24 Apr 2016 15:24:17 -0700 Subject: [PATCH 021/125] make clickable alert info use dark blue on blue --- app/assets/stylesheets/common/base/alert.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss index 1476a3f233..fa69ec0820 100644 --- a/app/assets/stylesheets/common/base/alert.scss +++ b/app/assets/stylesheets/common/base/alert.scss @@ -40,5 +40,8 @@ &.alert-info { background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); color: $primary; + .clickable { + color: $tertiary; + } } } From 7ee11b05080bc29d4f17b7387f5767eb69093030 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 25 Apr 2016 10:47:38 +1000 Subject: [PATCH 022/125] more logging, add referer --- app/controllers/embed_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb index bc1fbaea86..77f693046e 100644 --- a/app/controllers/embed_controller.rb +++ b/app/controllers/embed_controller.rb @@ -36,7 +36,12 @@ class EmbedController < ApplicationController end elsif embed_url.present? - Jobs.enqueue(:retrieve_topic, user_id: current_user.try(:id), embed_url: embed_url, author_username: embed_username) + Jobs.enqueue(:retrieve_topic, + user_id: current_user.try(:id), + embed_url: embed_url, + author_username: embed_username, + referer: request.env['HTTP_REFERER'] + ) render 'loading' end From 0b6d12f95dce480977101cec617056dec0660c9a Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 25 Apr 2016 11:24:52 +1000 Subject: [PATCH 023/125] FIX: when no notification state exists on topic, mute on unsubscribe --- app/controllers/topics_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index f667fbd517..8e02fad1ee 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -121,13 +121,13 @@ class TopicsController < ApplicationController tu = TopicUser.find_by(user_id: current_user.id, topic_id: params[:topic_id]) - if tu.notification_level > TopicUser.notification_levels[:regular] + if tu && tu.notification_level > TopicUser.notification_levels[:regular] tu.notification_level = TopicUser.notification_levels[:regular] + tu.save! else - tu.notification_level = TopicUser.notification_levels[:muted] + TopicUser.change(current_user.id, params[:topic_id].to_i, notification_level: TopicUser.notification_levels[:muted]) end - tu.save! perform_show_response end From b473cd10a6d198bc7296cd4c2a8efdf6cd925a0f Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Mon, 25 Apr 2016 08:34:07 +0530 Subject: [PATCH 024/125] UX: remove top border from onebox body on mobile --- app/assets/stylesheets/common/base/onebox.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index 4690377f86..e4956a9b11 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -321,3 +321,8 @@ aside.onebox.stackexchange .onebox-body img { max-height: 60%; max-width: 10%; } + +// mobile specific style +.mobile-view article.onebox-body { + border-top: none; +} From 3589327f94987f2b21cd595ff903ab1a12c5aa94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 25 Apr 2016 10:12:14 +0200 Subject: [PATCH 025/125] configure mention bot to use only members of the Discourse organization --- .mention-bot | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .mention-bot diff --git a/.mention-bot b/.mention-bot new file mode 100644 index 0000000000..ab045b194a --- /dev/null +++ b/.mention-bot @@ -0,0 +1,4 @@ +{ + "message": "Thanks @pullRequester for your pull request :+1:. By analyzing the blame information on this pull request, I identified @reviewers to be potential reviewers.", + "requiredOrgs": ["discourse"], +} From 78e596497abdc3e18ba403e1673ab510bc856c3d Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Mon, 25 Apr 2016 10:27:59 +0200 Subject: [PATCH 026/125] Correct error in mention-bot config --- .mention-bot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mention-bot b/.mention-bot index ab045b194a..d1999edd24 100644 --- a/.mention-bot +++ b/.mention-bot @@ -1,4 +1,4 @@ { "message": "Thanks @pullRequester for your pull request :+1:. By analyzing the blame information on this pull request, I identified @reviewers to be potential reviewers.", - "requiredOrgs": ["discourse"], + "requiredOrgs": ["discourse"] } From d1f61015c0143b1c87e8dc89175b28301ba48669 Mon Sep 17 00:00:00 2001 From: shaktikatare1989 Date: Mon, 25 Apr 2016 14:03:38 +0530 Subject: [PATCH 027/125] Fix: Editing a topic with an invalid title will still push it to the top (#4185) * fix: Editing a topic with an invalid title will still push it to the top * add specs to check topic not bumped with invalid title --- lib/post_revisor.rb | 2 +- spec/models/topic_spec.rb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb index 05c85d0fa5..093b55c924 100644 --- a/lib/post_revisor.rb +++ b/lib/post_revisor.rb @@ -363,7 +363,7 @@ class PostRevisor end def bypass_bump? - !@post_successfully_saved || @opts[:bypass_bump] == true + !@post_successfully_saved || @topic_changes.errored? || @opts[:bypass_bump] == true end def is_last_post? diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 4ae8009f37..e9b8b84cff 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -488,6 +488,13 @@ describe Topic do @topic.reload }.not_to change(@topic, :bumped_at) end + + it "doesn't bump the topic when a post have invalid topic title while edit" do + expect { + @last_post.revise(Fabricate(:moderator), { title: 'invalid title' }) + @topic.reload + }.not_to change(@topic, :bumped_at) + end end end From 514c3976f05785f487d275af1e96c43533e7a478 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 14 Apr 2016 15:23:05 -0400 Subject: [PATCH 028/125] PERF: Migrate header to discourse widgets --- .../components/hamburger-menu.js.es6 | 76 ----- .../components/header-dropdown.js.es6 | 7 - .../components/header-extra-info.js.es6 | 55 +--- .../discourse/components/home-logo.js.es6 | 58 ---- .../discourse/components/menu-panel.js.es6 | 224 -------------- .../discourse/components/mount-widget.js.es6 | 66 +++-- .../components/notification-item.js.es6 | 105 ------- .../components/scrolling-post-stream.js.es6 | 19 ++ .../discourse/components/search-menu.js.es6 | 162 ---------- .../components/search-result-category.js.es6 | 2 - .../components/search-result-post.js.es6 | 2 - .../components/search-result-topic.js.es6 | 2 - .../components/search-result-user.js.es6 | 2 - .../discourse/components/search-result.js.es6 | 11 - .../discourse/components/site-header.js.es6 | 187 ++++++++++++ .../discourse/components/user-menu.js.es6 | 104 ------- .../user-notifications-large.js.es6 | 16 + .../discourse/controllers/composer.js.es6 | 2 +- .../discourse/controllers/header.js.es6 | 79 +---- .../discourse/controllers/topic.js.es6 | 11 +- .../controllers/user-notifications.js.es6 | 4 +- .../apply-flagged-properties.js.es6 | 2 +- .../subscribe-user-notifications.js.es6 | 7 +- .../discourse/lib/intercept-click.js.es6 | 1 + .../discourse/lib/keyboard-shortcuts.js.es6 | 47 +-- .../discourse/lib/plugin-api.js.es6 | 14 +- .../discourse/routes/application.js.es6 | 17 ++ .../discourse/routes/discourse.js.es6 | 1 - .../javascripts/discourse/routes/topic.js.es6 | 12 +- .../discourse/templates/application.hbs | 9 +- .../templates/components/hamburger-menu.hbs | 94 ------ .../templates/components/header-dropdown.hbs | 9 - .../components/header-extra-info.hbs | 21 -- .../templates/components/menu-links.hbs | 7 - .../templates/components/menu-panel.hbs | 7 - .../templates/components/search-menu.hbs | 40 --- .../components/search-result-category.hbs | 7 - .../components/search-result-post.hbs | 14 - .../components/search-result-topic.hbs | 14 - .../components/search-result-user.hbs | 8 - .../templates/components/user-menu.hbs | 48 --- ...{similar_topics.hbs => similar-topics.hbs} | 2 +- .../discourse/templates/header.hbs | 66 ----- .../templates/user/notifications-index.hbs | 9 +- .../templates/user/notifications.hbs | 4 +- .../discourse/views/composer.js.es6 | 2 +- .../javascripts/discourse/views/header.js.es6 | 55 ---- .../javascripts/discourse/views/topic.js.es6 | 28 +- .../discourse/views/user-notifications.js.es6 | 6 - .../discourse/widgets/actions-summary.js.es6 | 1 + .../discourse/widgets/button.js.es6 | 2 + .../discourse/widgets/click-hook.js.es6 | 64 ---- .../widgets/hamburger-categories.js.es6 | 2 +- .../discourse/widgets/hamburger-menu.js.es6 | 158 ++++++++++ .../widgets/header-topic-info.js.es6 | 54 ++++ .../discourse/widgets/header.js.es6 | 278 ++++++++++++++++++ .../discourse/widgets/home-logo.js.es6 | 48 +++ .../discourse/widgets/hooks.js.es6 | 67 +++++ .../javascripts/discourse/widgets/link.js.es6 | 84 ++++++ .../discourse/widgets/menu-panel.js.es6 | 32 ++ .../widgets/notification-item.js.es6 | 109 +++++++ .../discourse/widgets/post-gutter.js.es6 | 1 + .../javascripts/discourse/widgets/post.js.es6 | 3 +- .../discourse/widgets/raw-html.js.es6 | 6 +- .../widgets/search-menu-controls.js.es6 | 60 ++++ .../widgets/search-menu-results.js.es6 | 100 +++++++ .../discourse/widgets/search-menu.js.es6 | 166 +++++++++++ .../discourse/widgets/topic-map.js.es6 | 1 + .../discourse/widgets/topic-status.js.es6 | 39 +++ .../discourse/widgets/user-menu.js.es6 | 93 ++++++ .../widgets/user-notifications-large.js.es6 | 25 ++ .../widgets/user-notifications.js.es6 | 81 +++++ .../discourse/widgets/widget.js.es6 | 31 +- app/assets/javascripts/main_include.js | 3 +- .../stylesheets/common/base/header.scss | 2 +- .../hamburger-menu-staff-test.js.es6 | 13 - .../acceptance/hamburger-menu-test.js.es6 | 21 -- .../acceptance/header-anonymous-test.js.es6 | 30 -- .../acceptance/header-test-staff.js.es6 | 14 - .../javascripts/acceptance/search-test.js.es6 | 1 + .../components/menu-panel-test.js.es6 | 65 ---- .../javascripts/controllers/topic-test.js.es6 | 2 +- .../javascripts/helpers/component-test.js.es6 | 17 +- test/javascripts/helpers/qunit-helpers.js.es6 | 4 +- .../widgets/actions-summary-test.js.es6 | 4 +- .../widgets/hamburger-menu-test.js.es6 | 173 +++++++++++ test/javascripts/widgets/header-test.js.es6 | 37 +++ .../home-logo-test.js.es6 | 73 +++-- .../widgets/post-gutter-test.js.es6 | 2 + .../javascripts/widgets/user-menu-test.js.es6 | 106 +++++++ test/javascripts/widgets/widget-test.js.es6 | 2 + 91 files changed, 2179 insertions(+), 1640 deletions(-) delete mode 100644 app/assets/javascripts/discourse/components/hamburger-menu.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/home-logo.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/menu-panel.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/notification-item.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/search-menu.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/search-result-category.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/search-result-post.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/search-result-topic.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/search-result-user.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/search-result.js.es6 create mode 100644 app/assets/javascripts/discourse/components/site-header.js.es6 delete mode 100644 app/assets/javascripts/discourse/components/user-menu.js.es6 create mode 100644 app/assets/javascripts/discourse/components/user-notifications-large.js.es6 delete mode 100644 app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs delete mode 100644 app/assets/javascripts/discourse/templates/components/header-dropdown.hbs delete mode 100644 app/assets/javascripts/discourse/templates/components/header-extra-info.hbs delete mode 100644 app/assets/javascripts/discourse/templates/components/menu-links.hbs delete mode 100644 app/assets/javascripts/discourse/templates/components/menu-panel.hbs delete mode 100644 app/assets/javascripts/discourse/templates/components/search-menu.hbs delete mode 100644 app/assets/javascripts/discourse/templates/components/search-result-category.hbs delete mode 100644 app/assets/javascripts/discourse/templates/components/search-result-post.hbs delete mode 100644 app/assets/javascripts/discourse/templates/components/search-result-topic.hbs delete mode 100644 app/assets/javascripts/discourse/templates/components/search-result-user.hbs delete mode 100644 app/assets/javascripts/discourse/templates/components/user-menu.hbs rename app/assets/javascripts/discourse/templates/composer/{similar_topics.hbs => similar-topics.hbs} (64%) delete mode 100644 app/assets/javascripts/discourse/templates/header.hbs delete mode 100644 app/assets/javascripts/discourse/views/header.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-notifications.js.es6 delete mode 100644 app/assets/javascripts/discourse/widgets/click-hook.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/header.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/home-logo.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/hooks.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/link.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/menu-panel.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/notification-item.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/search-menu.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/topic-status.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/user-menu.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 create mode 100644 app/assets/javascripts/discourse/widgets/user-notifications.js.es6 delete mode 100644 test/javascripts/acceptance/hamburger-menu-staff-test.js.es6 delete mode 100644 test/javascripts/acceptance/hamburger-menu-test.js.es6 delete mode 100644 test/javascripts/acceptance/header-anonymous-test.js.es6 delete mode 100644 test/javascripts/acceptance/header-test-staff.js.es6 delete mode 100644 test/javascripts/components/menu-panel-test.js.es6 create mode 100644 test/javascripts/widgets/hamburger-menu-test.js.es6 create mode 100644 test/javascripts/widgets/header-test.js.es6 rename test/javascripts/{components => widgets}/home-logo-test.js.es6 (53%) create mode 100644 test/javascripts/widgets/user-menu-test.js.es6 diff --git a/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 deleted file mode 100644 index e00b175819..0000000000 --- a/app/assets/javascripts/discourse/components/hamburger-menu.js.es6 +++ /dev/null @@ -1,76 +0,0 @@ -import computed from 'ember-addons/ember-computed-decorators'; -import mobile from 'discourse/lib/mobile'; - -export default Ember.Component.extend({ - classNames: ['hamburger-panel'], - - @computed('currentUser.read_faq') - prioritizeFaq(readFaq) { - // If it's a custom FAQ never prioritize it - return Ember.isEmpty(this.siteSettings.faq_url) && !readFaq; - }, - - @computed() - showKeyboardShortcuts() { - return !this.site.mobileView && !this.capabilities.touch; - }, - - @computed() - showMobileToggle() { - return this.site.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch); - }, - - @computed() - mobileViewLinkTextKey() { - return this.site.mobileView ? "desktop_view" : "mobile_view"; - }, - - @computed() - faqUrl() { - return this.siteSettings.faq_url ? this.siteSettings.faq_url : Discourse.getURL('/faq'); - }, - - _lookupCount(type) { - const state = this.get('topicTrackingState'); - return state ? state.lookupCount(type) : 0; - }, - - @computed('topicTrackingState.messageCount') - newCount() { - return this._lookupCount('new'); - }, - - @computed('topicTrackingState.messageCount') - unreadCount() { - return this._lookupCount('unread'); - }, - - @computed() - categories() { - const hideUncategorized = !this.siteSettings.allow_uncategorized_topics; - const showSubcatList = this.siteSettings.show_subcategory_list; - const isStaff = Discourse.User.currentProp('staff'); - - return Discourse.Category.list().reject((c) => { - if (showSubcatList && c.get('parent_category_id')) { return true; } - if (hideUncategorized && c.get('isUncategorizedCategory') && !isStaff) { return true; } - return false; - }); - }, - - @computed() - showUserDirectoryLink() { - if (!this.siteSettings.enable_user_directory) return false; - if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) return false; - return true; - }, - - actions: { - keyboardShortcuts() { - this.sendAction('showKeyboardAction'); - }, - toggleMobileView() { - mobile.toggleMobileView(); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/header-dropdown.js.es6 b/app/assets/javascripts/discourse/components/header-dropdown.js.es6 index c747984855..af00290db8 100644 --- a/app/assets/javascripts/discourse/components/header-dropdown.js.es6 +++ b/app/assets/javascripts/discourse/components/header-dropdown.js.es6 @@ -1,14 +1,7 @@ -import computed from 'ember-addons/ember-computed-decorators'; - export default Ember.Component.extend({ tagName: 'li', classNameBindings: [':header-dropdown-toggle', 'active'], - @computed('showUser', 'path') - href(showUser, path) { - return showUser ? this.currentUser.get('path') : Discourse.getURL(path); - }, - active: Ember.computed.alias('toggleVisible'), actions: { diff --git a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 b/app/assets/javascripts/discourse/components/header-extra-info.js.es6 index 2182f3ea34..66aaf82cb9 100644 --- a/app/assets/javascripts/discourse/components/header-extra-info.js.es6 +++ b/app/assets/javascripts/discourse/components/header-extra-info.js.es6 @@ -1,54 +1,3 @@ -import DiscourseURL from 'discourse/lib/url'; - -const TopicCategoryComponent = Ember.Component.extend({ - needsSecondRow: Ember.computed.gt('secondRowItems.length', 0), - secondRowItems: function() { return []; }.property(), - - pmPath: function() { - var currentUser = this.get('currentUser'); - return currentUser && currentUser.pmPath(this.get('topic')); - }.property('topic'), - - showPrivateMessageGlyph: function() { - return !this.get('topic.is_warning') && this.get('topic.isPrivateMessage'); - }.property('topic.is_warning', 'topic.isPrivateMessage'), - - actions: { - jumpToTopPost() { - const topic = this.get('topic'); - if (topic) { - DiscourseURL.routeTo(topic.get('firstPostUrl')); - } - } - } - -}); - -let id = 0; - -// Allow us (and plugins) to register themselves as needing a second -// row in the header. If there is at least one thing in the second row -// the style changes to accomodate it. -function needsSecondRowIf(prop, cb) { - const rowId = "_second_row_" + (id++), - methodHash = {}; - - methodHash[id] = function() { - const secondRowItems = this.get('secondRowItems'), - propVal = this.get(prop); - if (cb.call(this, propVal)) { - secondRowItems.addObject(rowId); - } else { - secondRowItems.removeObject(rowId); - } - }.observes(prop).on('init'); - - TopicCategoryComponent.reopen(methodHash); +export function needsSecondRowIf() { + Ember.warn("DEPRECATION: `needsSecondRowIf` is deprecated. Use widget hooks on `header-second-row`"); } - -needsSecondRowIf('topic.category', function(cat) { - return cat && (!cat.get('isUncategorizedCategory') || !this.siteSettings.suppress_uncategorized_badge); -}); - -export default TopicCategoryComponent; -export { needsSecondRowIf }; diff --git a/app/assets/javascripts/discourse/components/home-logo.js.es6 b/app/assets/javascripts/discourse/components/home-logo.js.es6 deleted file mode 100644 index 4798205e2e..0000000000 --- a/app/assets/javascripts/discourse/components/home-logo.js.es6 +++ /dev/null @@ -1,58 +0,0 @@ -import DiscourseURL from 'discourse/lib/url'; -import { iconHTML } from 'discourse/helpers/fa-icon'; -import { observes } from 'ember-addons/ember-computed-decorators'; - -export default Ember.Component.extend({ - widget: 'home-logo', - showMobileLogo: null, - linkUrl: null, - classNames: ['title'], - - init() { - this._super(); - this.showMobileLogo = this.site.mobileView && !Ember.isEmpty(this.siteSettings.mobile_logo_url); - this.linkUrl = this.get('targetUrl') || '/'; - }, - - @observes('minimized') - _updateLogo() { - // On mobile we don't minimize the logo - if (!this.site.mobileView) { - this.rerender(); - } - }, - - click(e) { - // if they want to open in a new tab, let it so - if (e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) { return true; } - - e.preventDefault(); - - DiscourseURL.routeTo(this.linkUrl); - return false; - }, - - render(buffer) { - const { siteSettings } = this; - const logoUrl = siteSettings.logo_url || ''; - const title = siteSettings.title; - - buffer.push(``); - if (!this.site.mobileView && this.get('minimized')) { - const logoSmallUrl = siteSettings.logo_small_url || ''; - if (logoSmallUrl.length) { - buffer.push(``); - } else { - buffer.push(iconHTML('home')); - } - } else if (this.showMobileLogo) { - buffer.push(``); - } else if (logoUrl.length) { - buffer.push(``); - } else { - buffer.push(``); - } - buffer.push(''); - } - -}); diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6 deleted file mode 100644 index ca017a1171..0000000000 --- a/app/assets/javascripts/discourse/components/menu-panel.js.es6 +++ /dev/null @@ -1,224 +0,0 @@ -import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators'; -import { headerHeight } from 'discourse/views/header'; - -const PANEL_BODY_MARGIN = 30; -const mutationSupport = !Ember.testing && !!window['MutationObserver']; - -export default Ember.Component.extend({ - classNameBindings: [':menu-panel', 'visible::hidden', 'viewMode'], - _lastVisible: false, - - showClose: Ember.computed.equal('viewMode', 'slide-in'), - - _layoutComponent() { - if (!this.get('visible')) { return; } - - const $window = $(window); - let width = this.get('maxWidth') || 300; - const windowWidth = parseInt($window.width()); - - if ((windowWidth - width) < 50) { - width = windowWidth - 50; - } - - const viewMode = this.get('viewMode'); - const $panelBody = this.$('.panel-body'); - let contentHeight = parseInt(this.$('.panel-body-contents').height()); - - // We use a mutationObserver to check for style changes, so it's important - // we don't set it if it doesn't change. Same goes for the $panelBody! - const style = this.$().prop('style'); - - if (viewMode === 'drop-down') { - const $buttonPanel = $('header ul.icons'); - if ($buttonPanel.length === 0) { return; } - - // These values need to be set here, not in the css file - this is to deal with the - // possibility of the window being resized and the menu changing from .slide-in to .drop-down. - if (style.top !== '100%' || style.height !== 'auto') { - this.$().css({ top: '100%', height: 'auto' }); - } - - // adjust panel height - const fullHeight = parseInt($window.height()); - const offsetTop = this.$().offset().top; - const scrollTop = $window.scrollTop(); - - if (contentHeight + (offsetTop - scrollTop) + PANEL_BODY_MARGIN > fullHeight) { - contentHeight = fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN; - } - if ($panelBody.height() !== contentHeight) { - $panelBody.height(contentHeight); - } - $('body').addClass('drop-down-visible'); - } else { - const menuTop = headerHeight(); - - let height; - const winHeight = $(window).height() - 16; - if ((menuTop + contentHeight) < winHeight) { - height = contentHeight + "px"; - } else { - height = winHeight - menuTop; - } - - if ($panelBody.prop('style').height !== '100%') { - $panelBody.height('100%'); - } - if (style.top !== menuTop + "px" || style.height !== height) { - this.$().css({ top: menuTop + "px", height }); - } - $('body').removeClass('drop-down-visible'); - } - - this.$().width(width); - }, - - @computed('force') - viewMode() { - const force = this.get('force'); - if (force) { return force; } - - const headerWidth = $('#main-outlet .container').width() || 1100; - const screenWidth = $(window).width(); - const remaining = parseInt((screenWidth - headerWidth) / 2); - - return (remaining < 50) ? 'slide-in' : 'drop-down'; - }, - - @observes('viewMode', 'visible') - _visibleChanged() { - if (this.get('visible')) { - // Allow us to hook into things being shown - if (!this._lastVisible) { - Ember.run.scheduleOnce('afterRender', () => this.sendAction('onVisible')); - this._lastVisible = true; - } - - $('html').on('click.close-menu-panel', (e) => { - const $target = $(e.target); - if ($target.closest('.header-dropdown-toggle').length > 0) { return; } - if ($target.closest('.menu-panel').length > 0) { return; } - this.hide(); - }); - this.performLayout(); - this._watchSizeChanges(); - - // iOS does not handle scroll events well - if (!this.capabilities.isIOS) { - $(window).on('scroll.discourse-menu-panel', () => this.performLayout()); - } - } else if (this._lastVisible) { - this._lastVisible = false; - Ember.run.scheduleOnce('afterRender', () => this.sendAction('onHidden')); - $('html').off('click.close-menu-panel'); - $(window).off('scroll.discourse-menu-panel'); - this._stopWatchingSize(); - $('body').removeClass('drop-down-visible'); - } - }, - - @computed() - showKeyboardShortcuts() { - return !this.site.mobileView && !this.capabilities.touch; - }, - - @computed() - showMobileToggle() { - return this.site.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch); - }, - - @computed() - mobileViewLinkTextKey() { - return this.site.mobileView ? "desktop_view" : "mobile_view"; - }, - - @computed() - faqUrl() { - return this.siteSettings.faq_url ? this.siteSettings.faq_url : Discourse.getURL('/faq'); - }, - - performLayout() { - Ember.run.scheduleOnce('afterRender', this, this._layoutComponent); - }, - - _watchSizeChanges() { - if (mutationSupport) { - this._observer.disconnect(); - this._observer.observe(this.element, { childList: true, subtree: true, characterData: true, attributes: true }); - } else { - clearInterval(this._resizeInterval); - this._resizeInterval = setInterval(() => { - Ember.run(() => { - const $panelBodyContents = this.$('.panel-body-contents'); - if ($panelBodyContents && $panelBodyContents.length) { - const contentHeight = parseInt($panelBodyContents.height()); - if (contentHeight !== this._lastHeight) { this.performLayout(); } - this._lastHeight = contentHeight; - } - }); - }, 500); - } - }, - - _stopWatchingSize() { - if (mutationSupport) { - this._observer.disconnect(); - } else { - clearInterval(this._resizeInterval); - } - }, - - @on('didInsertElement') - _bindEvents() { - this.$().on('click.discourse-menu-panel', 'a', e => { - if (e.metaKey || e.ctrlKey || e.shiftKey) { return; } - const $target = $(e.target); - if ($target.data('ember-action') || $target.closest('.search-link').length > 0) { return; } - this.hide(); - }); - - this.appEvents.on('dropdowns:closeAll', this, this.hide); - this.appEvents.on('dom:clean', this, this.hide); - - $('body').on('keydown.discourse-menu-panel', e => { - if (e.which === 27) { - this.hide(); - } - }); - - $(window).on('resize.discourse-menu-panel', () => { - this.propertyDidChange('viewMode'); - this.performLayout(); - }); - - if (mutationSupport) { - this._observer = new MutationObserver(() => { - Ember.run.debounce(this, this.performLayout, 50); - }); - } - - this.propertyDidChange('viewMode'); - }, - - @on('willDestroyElement') - _removeEvents() { - this.appEvents.off('dom:clean', this, this.hide); - this.appEvents.off('dropdowns:closeAll', this, this.hide); - this.$().off('click.discourse-menu-panel'); - $('body').off('keydown.discourse-menu-panel'); - $('html').off('click.close-menu-panel'); - $(window).off('resize.discourse-menu-panel'); - $(window).off('scroll.discourse-menu-panel'); - }, - - hide() { - this.set('visible', false); - }, - - actions: { - close() { - this.hide(); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6 index b7a8fdb020..85d43d37c8 100644 --- a/app/assets/javascripts/discourse/components/mount-widget.js.es6 +++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6 @@ -1,5 +1,6 @@ +import { keyDirty } from 'discourse/widgets/widget'; import { diff, patch } from 'virtual-dom'; -import { WidgetClickHook } from 'discourse/widgets/click-hook'; +import { WidgetClickHook } from 'discourse/widgets/hooks'; import { renderedKey, queryRegistry } from 'discourse/widgets/widget'; const _cleanCallbacks = {}; @@ -13,13 +14,20 @@ export default Ember.Component.extend({ _rootNode: null, _timeout: null, _widgetClass: null, - _afterRender: null, + _renderCallback: null, + _childEvents: null, init() { this._super(); const name = this.get('widget'); this._widgetClass = queryRegistry(name) || this.container.lookupFactory(`widget:${name}`); + + if (!this._widgetClass) { + console.error(`Error: Could not find widget: ${name}`); + } + + this._childEvents = []; this._connected = []; }, @@ -42,50 +50,64 @@ export default Ember.Component.extend({ }, willDestroyElement() { + this._childEvents.forEach(evt => this.appEvents.off(evt)); Ember.run.cancel(this._timeout); }, + afterRender() { + }, + + beforePatch() { + }, + + afterPatch() { + }, + + dispatch(eventName, key) { + this._childEvents.push(eventName); + this.appEvents.on(eventName, refreshArg => { + const onRefresh = Ember.String.camelize(eventName.replace(/:/, '-')); + keyDirty(key, { onRefresh, refreshArg }); + this.queueRerender(); + }); + }, + queueRerender(callback) { - if (callback && !this._afterRender) { - this._afterRender = callback; + if (callback && !this._renderCallback) { + this._renderCallback = callback; } Ember.run.scheduleOnce('render', this, this.rerenderWidget); }, + buildArgs() { + }, + rerenderWidget() { Ember.run.cancel(this._timeout); if (this._rootNode) { + if (!this._widgetClass) { return; } + const t0 = new Date().getTime(); + const args = this.get('args') || this.buildArgs(); const opts = { model: this.get('model') }; - const newTree = new this._widgetClass(this.get('args'), this.container, opts); + const newTree = new this._widgetClass(args, this.container, opts); newTree._emberView = this; const patches = diff(this._tree || this._rootNode, newTree); - const $body = $(document); - const prevHeight = $body.height(); - const prevScrollTop = $body.scrollTop(); - + this.beforePatch(); this._rootNode = patch(this._rootNode, patches); - - const height = $body.height(); - const scrollTop = $body.scrollTop(); - - // This hack is for when swapping out many cloaked views at once - // when using keyboard navigation. It could suddenly move the - // scroll - if (prevHeight === height && scrollTop !== prevScrollTop) { - $body.scrollTop(prevScrollTop); - } + this.afterPatch(); this._tree = newTree; - if (this._afterRender) { - this._afterRender(); - this._afterRender = null; + if (this._renderCallback) { + this._renderCallback(); + this._renderCallback = null; } + this.afterRender(); renderedKey('*'); if (this.profileWidget) { diff --git a/app/assets/javascripts/discourse/components/notification-item.js.es6 b/app/assets/javascripts/discourse/components/notification-item.js.es6 deleted file mode 100644 index 64411038df..0000000000 --- a/app/assets/javascripts/discourse/components/notification-item.js.es6 +++ /dev/null @@ -1,105 +0,0 @@ -const LIKED_TYPE = 5; -const INVITED_TYPE = 8; -const GROUP_SUMMARY_TYPE = 16; - -export default Ember.Component.extend({ - tagName: 'li', - classNameBindings: ['notification.read', 'notification.is_warning'], - - name: function() { - var notificationType = this.get("notification.notification_type"); - var lookup = this.site.get("notificationLookup"); - return lookup[notificationType]; - }.property("notification.notification_type"), - - scope: function() { - if (this.get("name") === "custom") { - return this.get("notification.data.message"); - } else { - return "notifications." + this.get("name"); - } - }.property("name"), - - url: function() { - const it = this.get('notification'); - const badgeId = it.get("data.badge_id"); - if (badgeId) { - var badgeSlug = it.get("data.badge_slug"); - - if (!badgeSlug) { - const badgeName = it.get("data.badge_name"); - badgeSlug = badgeName.replace(/[^A-Za-z0-9_]+/g, '-').toLowerCase(); - } - - var username = it.get('data.username'); - username = username ? "?username=" + username.toLowerCase() : ""; - return Discourse.getURL('/badges/' + badgeId + '/' + badgeSlug + username); - } - - const topicId = it.get('topic_id'); - if (topicId) { - return Discourse.Utilities.postUrl(it.get("slug"), topicId, it.get("post_number")); - } - - if (it.get('notification_type') === INVITED_TYPE) { - return Discourse.getURL('/users/' + it.get('data.display_username')); - } - - if (it.get('data.group_id')) { - return Discourse.getURL('/users/' + it.get('data.username') + '/messages/group/' + it.get('data.group_name')); - } - - }.property("notification.data.{badge_id,badge_name,display_username}", "model.slug", "model.topic_id", "model.post_number"), - - description: function() { - const badgeName = this.get("notification.data.badge_name"); - if (badgeName) { return Discourse.Utilities.escapeExpression(badgeName); } - - const title = this.get('notification.data.topic_title'); - return Ember.isEmpty(title) ? "" : Discourse.Utilities.escapeExpression(title); - }.property("notification.data.{badge_name,topic_title}"), - - _markRead: function(){ - this.$('a').click(() => { - this.set('notification.read', true); - Discourse.setTransientHeader("Discourse-Clear-Notifications", this.get('notification.id')); - if (document && document.cookie) { - document.cookie = `cn=${this.get('notification.id')}; expires=Fri, 31 Dec 9999 23:59:59 GMT`; - } - return true; - }); - }.on('didInsertElement'), - - render(buffer) { - const notification = this.get('notification'); - // since we are reusing views now sometimes this can be unset - if (!notification) { return; } - const description = this.get('description'); - const username = notification.get('data.display_username'); - var text; - if (notification.get('notification_type') === GROUP_SUMMARY_TYPE) { - const count = notification.get('data.inbox_count'); - const group_name = notification.get('data.group_name'); - text = I18n.t(this.get('scope'), {count, group_name}); - } else if (notification.get('notification_type') === LIKED_TYPE && notification.get("data.count") > 1) { - const count = notification.get('data.count') - 2; - const username2 = notification.get('data.username2'); - if (count===0) { - text = I18n.t('notifications.liked_2', {description, username, username2}); - } else { - text = I18n.t('notifications.liked_many', {description, username, username2, count}); - } - } - else { - text = I18n.t(this.get('scope'), {description, username}); - } - text = Discourse.Emoji.unescape(text); - - const url = this.get('url'); - if (url) { - buffer.push('' + text + ''); - } else { - buffer.push(text); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 index 38ad5fea69..c5625a8109 100644 --- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 +++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 @@ -37,6 +37,25 @@ export default MountWidget.extend({ 'searchService'); }).volatile(), + beforePatch() { + const $body = $(document); + this.prevHeight = $body.height(); + this.prevScrollTop = $body.scrollTop(); + }, + + afterPatch() { + const $body = $(document); + const height = $body.height(); + const scrollTop = $body.scrollTop(); + + // This hack is for when swapping out many cloaked views at once + // when using keyboard navigation. It could suddenly move the + // scroll + if (this.prevHeight === height && scrollTop !== this.prevScrollTop) { + $body.scrollTop(this.prevScrollTop); + } + }, + scrolled() { if (this.isDestroyed || this.isDestroying) { return; } if (isWorkaroundActive()) { return; } diff --git a/app/assets/javascripts/discourse/components/search-menu.js.es6 b/app/assets/javascripts/discourse/components/search-menu.js.es6 deleted file mode 100644 index be80d20a26..0000000000 --- a/app/assets/javascripts/discourse/components/search-menu.js.es6 +++ /dev/null @@ -1,162 +0,0 @@ -import {searchForTerm, searchContextDescription, isValidSearchTerm } from 'discourse/lib/search'; -import DiscourseURL from 'discourse/lib/url'; -import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; -import showModal from 'discourse/lib/show-modal'; - -let _dontSearch = false; -export default Ember.Component.extend({ - searchService: Ember.inject.service('search'), - classNames: ['search-menu'], - typeFilter: null, - - @observes('searchService.searchContext') - contextChanged: function() { - if (this.get('searchService.searchContextEnabled')) { - _dontSearch = true; - this.set('searchService.searchContextEnabled', false); - _dontSearch = false; - } - }, - - @computed('searchService.searchContext', 'searchService.term', 'searchService.searchContextEnabled') - fullSearchUrlRelative(searchContext, term, searchContextEnabled) { - - if (searchContextEnabled && Ember.get(searchContext, 'type') === 'topic') { - return null; - } - - let url = '/search?q=' + encodeURIComponent(this.get('searchService.term')); - if (searchContextEnabled) { - if (searchContext.id.toString().toLowerCase() === this.get('currentUser.username_lower') && - searchContext.type === "private_messages" - ) { - url += ' in:private'; - } else { - url += encodeURIComponent(" " + searchContext.type + ":" + searchContext.id); - } - } - - return url; - }, - - @computed('fullSearchUrlRelative') - fullSearchUrl(fullSearchUrlRelative) { - if (fullSearchUrlRelative) { - return Discourse.getURL(fullSearchUrlRelative); - } - }, - - @computed('searchService.searchContext') - searchContextDescription(ctx) { - return searchContextDescription(Em.get(ctx, 'type'), Em.get(ctx, 'user.username') || Em.get(ctx, 'category.name')); - }, - - @observes('searchService.searchContextEnabled') - searchContextEnabledChanged() { - if (_dontSearch) { return; } - this.newSearchNeeded(); - }, - - // If we need to perform another search - @observes('searchService.term', 'typeFilter') - newSearchNeeded() { - this.set('noResults', false); - const term = this.get('searchService.term'); - if (isValidSearchTerm(term)) { - this.set('loading', true); - Ember.run.debounce(this, 'searchTerm', term, this.get('typeFilter'), 400); - } else { - this.setProperties({ content: null }); - } - this.set('selectedIndex', 0); - }, - - searchTerm(term, typeFilter) { - // for cancelling debounced search - if (this._cancelSearch){ - this._cancelSearch = null; - return; - } - - if (this._search) { - this._search.abort(); - } - - const searchContext = this.get('searchService.searchContextEnabled') ? this.get('searchService.searchContext') : null; - this._search = searchForTerm(term, { typeFilter, searchContext, fullSearchUrl: this.get('fullSearchUrl') }); - - this._search.then((content) => { - this.setProperties({ noResults: !content, content }); - }).finally(() => { - this.set('loading', false); - this._search = null; - }); - }, - - @computed('typeFilter', 'loading') - showCancelFilter(typeFilter, loading) { - if (loading) { return false; } - return !Ember.isEmpty(typeFilter); - }, - - @observes('searchService.term') - termChanged() { - this.cancelTypeFilter(); - }, - - actions: { - fullSearch() { - const self = this; - - if (this._search) { - this._search.abort(); - } - - // maybe we are debounced and delayed - // stop that as well - this._cancelSearch = true; - Em.run.later(function() { - self._cancelSearch = false; - }, 400); - - const url = this.get('fullSearchUrlRelative'); - if (url) { - DiscourseURL.routeTo(url); - } - }, - - moreOfType(type) { - this.set('typeFilter', type); - }, - - cancelType() { - this.cancelTypeFilter(); - }, - - showedSearch() { - $('#search-term').focus().select(); - }, - - showSearchHelp() { - // TODO: @EvitTrout how do we get a loading indicator here? - Discourse.ajax("/static/search_help.html", { dataType: 'html' }).then((model) => { - showModal('searchHelp', { model }); - }); - }, - - cancelHighlight() { - this.set('searchService.highlightTerm', null); - } - }, - - cancelTypeFilter() { - this.set('typeFilter', null); - }, - - keyDown(e) { - if (e.which === 13 && isValidSearchTerm(this.get('searchService.term'))) { - this.set('visible', false); - this.send('fullSearch'); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/search-result-category.js.es6 b/app/assets/javascripts/discourse/components/search-result-category.js.es6 deleted file mode 100644 index e23284ed16..0000000000 --- a/app/assets/javascripts/discourse/components/search-result-category.js.es6 +++ /dev/null @@ -1,2 +0,0 @@ -import SearchResult from 'discourse/components/search-result'; -export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result-post.js.es6 b/app/assets/javascripts/discourse/components/search-result-post.js.es6 deleted file mode 100644 index e23284ed16..0000000000 --- a/app/assets/javascripts/discourse/components/search-result-post.js.es6 +++ /dev/null @@ -1,2 +0,0 @@ -import SearchResult from 'discourse/components/search-result'; -export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result-topic.js.es6 b/app/assets/javascripts/discourse/components/search-result-topic.js.es6 deleted file mode 100644 index e23284ed16..0000000000 --- a/app/assets/javascripts/discourse/components/search-result-topic.js.es6 +++ /dev/null @@ -1,2 +0,0 @@ -import SearchResult from 'discourse/components/search-result'; -export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result-user.js.es6 b/app/assets/javascripts/discourse/components/search-result-user.js.es6 deleted file mode 100644 index e23284ed16..0000000000 --- a/app/assets/javascripts/discourse/components/search-result-user.js.es6 +++ /dev/null @@ -1,2 +0,0 @@ -import SearchResult from 'discourse/components/search-result'; -export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result.js.es6 b/app/assets/javascripts/discourse/components/search-result.js.es6 deleted file mode 100644 index dacf1f2696..0000000000 --- a/app/assets/javascripts/discourse/components/search-result.js.es6 +++ /dev/null @@ -1,11 +0,0 @@ -export default Ember.Component.extend({ - tagName: 'ul', - - _highlightOnInsert: function() { - const term = this.get('controller.term'); - if(!_.isEmpty(term)) { - this.$('.blurb').highlight(term.split(/\s+/), {className: 'search-highlight'}); - this.$('.topic-title').highlight(term.split(/\s+/), {className: 'search-highlight'} ); - } - }.on('didInsertElement') -}); diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6 new file mode 100644 index 0000000000..bfd6bb32f5 --- /dev/null +++ b/app/assets/javascripts/discourse/components/site-header.js.es6 @@ -0,0 +1,187 @@ +import MountWidget from 'discourse/components/mount-widget'; +import { observes } from 'ember-addons/ember-computed-decorators'; + +const _flagProperties = []; +function addFlagProperty(prop) { + _flagProperties.pushObject(prop); +} + +const PANEL_BODY_MARGIN = 30; + +const SiteHeaderComponent = MountWidget.extend({ + widget: 'header', + docAt: null, + dockedHeader: null, + _topic: null, + + // profileWidget: true, + // classNameBindings: ['editingTopic'], + + @observes('currentUser.unread_notifications', 'currentUser.unread_private_messages') + _notificationsChanged() { + this.queueRerender(); + }, + + examineDockHeader() { + const $body = $('body'); + + // Check the dock after the current run loop. While rendering, + // it's much slower to calculate `outlet.offset()` + Ember.run.next(() => { + if (this.docAt === null) { + const outlet = $('#main-outlet'); + if (!(outlet && outlet.length === 1)) return; + this.docAt = outlet.offset().top; + } + + const offset = window.pageYOffset || $('html').scrollTop(); + if (offset >= this.docAt) { + if (!this.dockedHeader) { + $body.addClass('docked'); + this.dockedHeader = true; + } + } else { + if (this.dockedHeader) { + $body.removeClass('docked'); + this.dockedHeader = false; + } + } + }); + }, + + setTopic(topic) { + this._topic = topic; + this.queueRerender(); + }, + + didInsertElement() { + this._super(); + $(window).bind('scroll.discourse-dock', () => this.examineDockHeader()); + $(document).bind('touchmove.discourse-dock', () => this.examineDockHeader()); + $(window).on('resize.discourse-menu-panel', () => this.afterRender()); + + this.appEvents.on('header:show-topic', topic => this.setTopic(topic)); + this.appEvents.on('header:hide-topic', () => this.setTopic(null)); + + this.dispatch('notifications:changed', 'user-notifications'); + this.dispatch('header:keyboard-trigger', 'header'); + this.examineDockHeader(); + }, + + willDestroyElement() { + this._super(); + $(window).unbind('scroll.discourse-dock'); + $(document).unbind('touchmove.discourse-dock'); + $('body').off('keydown.header'); + this.appEvents.off('notifications:changed'); + $(window).off('resize.discourse-menu-panel'); + + this.appEvents.off('header:show-topic'); + this.appEvents.off('header:hide-topic'); + }, + + buildArgs() { + return { + flagCount: _flagProperties.reduce((prev, cur) => prev + this.get(cur), 0), + topic: this._topic, + canSignUp: this.get('canSignUp') + }; + }, + + afterRender() { + const $menuPanels = $('.menu-panel'); + if ($menuPanels.length === 0) { return; } + + const $window = $(window); + const windowWidth = parseInt($window.width()); + + + const headerWidth = $('#main-outlet .container').width() || 1100; + const remaining = parseInt((windowWidth - headerWidth) / 2); + const viewMode = (remaining < 50) ? 'slide-in' : 'drop-down'; + + $menuPanels.each((idx, panel) => { + const $panel = $(panel); + let width = parseInt($panel.attr('data-max-width') || 300); + if ((windowWidth - width) < 50) { + width = windowWidth - 50; + } + + $panel.removeClass('drop-down').removeClass('slide-in').addClass(viewMode); + + const $panelBody = $('.panel-body', $panel); + let contentHeight = parseInt($('.panel-body-contents', $panel).height()); + + // We use a mutationObserver to check for style changes, so it's important + // we don't set it if it doesn't change. Same goes for the $panelBody! + const style = $panel.prop('style'); + + if (viewMode === 'drop-down') { + const $buttonPanel = $('header ul.icons'); + if ($buttonPanel.length === 0) { return; } + + // These values need to be set here, not in the css file - this is to deal with the + // possibility of the window being resized and the menu changing from .slide-in to .drop-down. + if (style.top !== '100%' || style.height !== 'auto') { + $panel.css({ top: '100%', height: 'auto' }); + } + + // adjust panel height + const fullHeight = parseInt($window.height()); + const offsetTop = $panel.offset().top; + const scrollTop = $window.scrollTop(); + + if (contentHeight + (offsetTop - scrollTop) + PANEL_BODY_MARGIN > fullHeight) { + contentHeight = fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN; + } + if ($panelBody.height() !== contentHeight) { + $panelBody.height(contentHeight); + } + $('body').addClass('drop-down-visible'); + } else { + const menuTop = headerHeight(); + + let height; + const winHeight = $(window).height() - 16; + if ((menuTop + contentHeight) < winHeight) { + height = contentHeight + "px"; + } else { + height = winHeight - menuTop; + } + + if ($panelBody.prop('style').height !== '100%') { + $panelBody.height('100%'); + } + if (style.top !== menuTop + "px" || style.height !== height) { + $panel.css({ top: menuTop + "px", height }); + } + $('body').removeClass('drop-down-visible'); + } + + $panel.width(width); + }); + } +}); + +export default SiteHeaderComponent; + +function applyFlaggedProperties() { + const args = _flagProperties.slice(); + args.push(function() { + this.queueRerender(); + }.on('init')); + + SiteHeaderComponent.reopen({ _flagsChanged: Ember.observer.apply(this, args) }); +} + +addFlagProperty('currentUser.site_flagged_posts_count'); +addFlagProperty('currentUser.post_queue_new_count'); + +export { addFlagProperty, applyFlaggedProperties }; + +export function headerHeight() { + const $header = $('header.d-header'); + const headerOffset = $header.offset(); + const headerOffsetTop = (headerOffset) ? headerOffset.top : 0; + return parseInt($header.outerHeight() + headerOffsetTop - $(window).scrollTop()); +} diff --git a/app/assets/javascripts/discourse/components/user-menu.js.es6 b/app/assets/javascripts/discourse/components/user-menu.js.es6 deleted file mode 100644 index d864f23ba4..0000000000 --- a/app/assets/javascripts/discourse/components/user-menu.js.es6 +++ /dev/null @@ -1,104 +0,0 @@ -import { url } from 'discourse/lib/computed'; -import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; -import { headerHeight } from 'discourse/views/header'; - -export default Ember.Component.extend({ - classNames: ['user-menu'], - notifications: null, - loadingNotifications: false, - notificationsPath: url('currentUser.path', '%@/notifications'), - bookmarksPath: url('currentUser.path', '%@/activity/bookmarks'), - messagesPath: url('currentUser.path', '%@/messages'), - preferencesPath: url('currentUser.path', '%@/preferences'), - - @computed('allowAnon', 'isAnon') - showEnableAnon(allowAnon, isAnon) { return allowAnon && !isAnon; }, - - @computed('allowAnon', 'isAnon') - showDisableAnon(allowAnon, isAnon) { return allowAnon && isAnon; }, - - @observes('visible') - _loadNotifications() { - if (this.get("visible")) { - this.refreshNotifications(); - } - }, - - @observes('currentUser.lastNotificationChange') - _resetCachedNotifications() { - const visible = this.get('visible'); - - if (!Discourse.get("hasFocus")) { - this.set('visible', false); - this.set('notifications', null); - return; - } - - if (visible) { - this.refreshNotifications(); - } else { - this.set('notifications', null); - } - }, - - refreshNotifications() { - if (this.get('loadingNotifications')) { return; } - - // estimate (poorly) the amount of notifications to return - var limit = Math.round(($(window).height() - headerHeight()) / 55); - // we REALLY don't want to be asking for negative counts of notifications - // less than 5 is also not that useful - if (limit < 5) { limit = 5; } - if (limit > 40) { limit = 40; } - - // TODO: It's a bit odd to use the store in a component, but this one really - // wants to reach out and grab notifications - const store = this.container.lookup('store:main'); - const stale = store.findStale('notification', {recent: true, limit }, {cacheKey: 'recent-notifications'}); - - if (stale.hasResults) { - const results = stale.results; - var content = results.get('content'); - - // we have to truncate to limit, otherwise we will render too much - if (content && (content.length > limit)) { - content = content.splice(0, limit); - results.set('content', content); - results.set('totalRows', limit); - } - - this.set('notifications', results); - } else { - this.set('loadingNotifications', true); - } - - stale.refresh().then((notifications) => { - this.set('currentUser.unread_notifications', 0); - this.set('notifications', notifications); - }).catch(() => { - this.set('notifications', null); - }).finally(() => { - this.set('loadingNotifications', false); - }); - }, - - @computed() - allowAnon() { - return this.siteSettings.allow_anonymous_posting && - (this.get("currentUser.trust_level") >= this.siteSettings.anonymous_posting_min_trust_level || - this.get("isAnon")); - }, - - isAnon: Ember.computed.alias('currentUser.is_anonymous'), - - actions: { - toggleAnon() { - Discourse.ajax("/users/toggle-anon", {method: 'POST'}).then(function(){ - window.location.reload(); - }); - }, - logout() { - this.sendAction('logoutAction'); - } - } -}); diff --git a/app/assets/javascripts/discourse/components/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/components/user-notifications-large.js.es6 new file mode 100644 index 0000000000..bfedea00f7 --- /dev/null +++ b/app/assets/javascripts/discourse/components/user-notifications-large.js.es6 @@ -0,0 +1,16 @@ +import MountWidget from 'discourse/components/mount-widget'; +import { observes } from "ember-addons/ember-computed-decorators"; + +export default MountWidget.extend({ + widget: 'user-notifications-large', + + init() { + this._super(); + this.args = { notifications: this.get('notifications') }; + }, + + @observes('notifications.length') + _triggerRefresh() { + this.queueRerender(); + } +}); diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 7333f6dd0a..b94ca33476 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -386,7 +386,7 @@ export default Ember.Controller.extend({ let message = this.get('similarTopicsMessage'); if (!message) { message = Discourse.ComposerMessage.create({ - templateName: 'composer/similar_topics', + templateName: 'composer/similar-topics', extraClass: 'similar-topics' }); this.set('similarTopicsMessage', message); diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6 index 57401135df..2665f2afbd 100644 --- a/app/assets/javascripts/discourse/controllers/header.js.es6 +++ b/app/assets/javascripts/discourse/controllers/header.js.es6 @@ -1,77 +1,6 @@ -import DiscourseURL from 'discourse/lib/url'; +import { addFlagProperty as realAddFlagProperty } from 'discourse/components/site-header'; -const HeaderController = Ember.Controller.extend({ - topic: null, - showExtraInfo: null, - hamburgerVisible: false, - searchVisible: false, - userMenuVisible: false, - needs: ['application'], - - canSignUp: Em.computed.alias('controllers.application.canSignUp'), - - showSignUpButton: function() { - return this.get('canSignUp') && !this.get('showExtraInfo'); - }.property('canSignUp', 'showExtraInfo'), - - showStarButton: function() { - return Discourse.User.current() && !this.get('topic.isPrivateMessage'); - }.property('topic.isPrivateMessage'), - - - actions: { - toggleSearch() { - this.toggleProperty('searchVisible'); - }, - showUserMenu() { - if (!this.get('userMenuVisible')) { - this.appEvents.trigger('dropdowns:closeAll'); - this.set('userMenuVisible', true); - } - }, - - fullPageSearch() { - const searchService = this.container.lookup('search-service:main'); - const context = searchService.get('searchContext'); - var params = ""; - - if (context) { - params = `?context=${context.type}&context_id=${context.id}&skip_context=true`; - } - - DiscourseURL.routeTo('/search' + params); - }, - toggleMenuPanel(visibleProp) { - this.toggleProperty(visibleProp); - this.appEvents.trigger('dropdowns:closeAll'); - }, - - toggleStar() { - const topic = this.get('topic'); - if (topic) topic.toggleStar(); - return false; - } - } -}); - -// Allow plugins to add to the sum of "flags" above the site map -const _flagProperties = []; -function addFlagProperty(prop) { - _flagProperties.pushObject(prop); +export function addFlagProperty(prop) { + Ember.warn("importing `addFlagProperty` is deprecated. Use the PluginAPI instead"); + realAddFlagProperty(prop); } - -function applyFlaggedProperties() { - const args = _flagProperties.slice(); - args.push(function() { - let sum = 0; - _flagProperties.forEach((fp) => sum += (this.get(fp) || 0)); - return sum; - }); - HeaderController.reopen({ flaggedPostsCount: Ember.computed.apply(this, args) }); -} - -addFlagProperty('currentUser.site_flagged_posts_count'); -addFlagProperty('currentUser.post_queue_new_count'); - -export { addFlagProperty, applyFlaggedProperties }; -export default HeaderController; diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index f70f8877bc..da342c73a1 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -9,7 +9,7 @@ import Composer from 'discourse/models/composer'; import DiscourseURL from 'discourse/lib/url'; export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { - needs: ['header', 'modal', 'composer', 'quote-button', 'topic-progress', 'application'], + needs: ['modal', 'composer', 'quote-button', 'topic-progress', 'application'], multiSelect: false, allPostsSelected: false, editingTopic: false, @@ -472,11 +472,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { this.get('content').toggleStatus('archived'); }, - // Toggle the star on the topic - toggleStar() { - this.get('content').toggleStar(); - }, - clearPin() { this.get('content').clearPin(); }, @@ -625,10 +620,6 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { return false; }, - showStarButton: function() { - return Discourse.User.current() && !this.get('model.isPrivateMessage'); - }.property('model.isPrivateMessage'), - loadingHTML: function() { return spinnerHTML; }.property(), diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 index c06137a9e1..e39d9a67c5 100644 --- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 @@ -10,13 +10,13 @@ export default Ember.ArrayController.extend({ currentPath: Em.computed.alias('controllers.application.currentPath'), actions: { - resetNew: function() { + resetNew() { Discourse.ajax('/notifications/mark-read', { method: 'PUT' }).then(() => { this.setEach('read', true); }); }, - loadMore: function() { + loadMore() { this.get('model').loadMore(); } } diff --git a/app/assets/javascripts/discourse/initializers/apply-flagged-properties.js.es6 b/app/assets/javascripts/discourse/initializers/apply-flagged-properties.js.es6 index 5408595451..197b6459c6 100644 --- a/app/assets/javascripts/discourse/initializers/apply-flagged-properties.js.es6 +++ b/app/assets/javascripts/discourse/initializers/apply-flagged-properties.js.es6 @@ -1,4 +1,4 @@ -import { applyFlaggedProperties } from 'discourse/controllers/header'; +import { applyFlaggedProperties } from 'discourse/components/site-header'; export default { name: 'apply-flagged-properties', diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 index 63ef5104b4..406b050d3b 100644 --- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 @@ -10,7 +10,8 @@ export default { siteSettings = container.lookup('site-settings:main'), bus = container.lookup('message-bus:main'), keyValueStore = container.lookup('key-value-store:main'), - store = container.lookup('store:main'); + store = container.lookup('store:main'), + appEvents = container.lookup('app-events:main'); // clear old cached notifications, we used to store in local storage // TODO 2017 delete this line @@ -30,7 +31,7 @@ export default { }); } - bus.subscribe("/notification/" + user.get('id'), function(data) { + bus.subscribe(`/notification/${user.get('id')}`, function(data) { const oldUnread = user.get('unread_notifications'); const oldPM = user.get('unread_private_messages'); @@ -38,7 +39,7 @@ export default { user.set('unread_private_messages', data.unread_private_messages); if (oldUnread !== data.unread_notifications || oldPM !== data.unread_private_messages) { - user.set('lastNotificationChange', new Date()); + appEvents.trigger('notifications:changed'); } const stale = store.findStale('notification', {}, {cacheKey: 'recent-notifications'}); diff --git a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 b/app/assets/javascripts/discourse/lib/intercept-click.js.es6 index 6ce7a300f3..658f55db64 100644 --- a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 +++ b/app/assets/javascripts/discourse/lib/intercept-click.js.es6 @@ -18,6 +18,7 @@ export default function interceptClick(e) { $currentTarget.data('auto-route') || $currentTarget.data('share-url') || $currentTarget.data('user-card') || + $currentTarget.hasClass('widget-link') || $currentTarget.hasClass('mention') || (!$currentTarget.hasClass('d-link') && $currentTarget.hasClass('ember-view')) || $currentTarget.hasClass('lightbox') || diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 index 748099a740..63aa464d1e 100644 --- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 +++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 @@ -10,8 +10,8 @@ const bindings = { '.': {click: '.alert.alert-info.clickable', anonymous: true}, // show incoming/updated topics 'b': {handler: 'toggleBookmark'}, 'c': {handler: 'createTopic'}, - 'ctrl+f': {handler: 'showBuiltinSearch', anonymous: true}, - 'command+f': {handler: 'showBuiltinSearch', anonymous: true}, + 'ctrl+f': {handler: 'showPageSearch', anonymous: true}, + 'command+f': {handler: 'showPageSearch', anonymous: true}, 'd': {postAction: 'deletePost'}, 'e': {postAction: 'editPost'}, 'end': {handler: 'goToLastPost', anonymous: true}, @@ -142,32 +142,10 @@ export default { this._changeSection(-1); }, - showBuiltinSearch() { - if (this.container.lookup('controller:header').get('searchVisible')) { - this.toggleSearch(); - return true; - } - - this.searchService.set('searchContextEnabled', false); - - const currentPath = this.container.lookup('controller:application').get('currentPath'), - blacklist = [ /^discovery\.categories/ ], - whitelist = [ /^topic\./ ], - check = function(regex) { return !!currentPath.match(regex); }; - let showSearch = whitelist.any(check) && !blacklist.any(check); - - // If we're viewing a topic, only intercept search if there are cloaked posts - if (showSearch && currentPath.match(/^topic\./)) { - showSearch = $('.topic-post .cooked, .small-action:not(.time-gap)').length < this.container.lookup('controller:topic').get('model.postStream.stream.length'); - } - - if (showSearch) { - this.searchService.set('searchContextEnabled', true); - this.toggleSearch(); - return false; - } - - return true; + showPageSearch(event) { + Ember.run(() => { + this.appEvents.trigger('header:keyboard-trigger', {type: 'page-search', event}); + }); }, createTopic() { @@ -182,17 +160,16 @@ export default { this.container.lookup('controller:topic-progress').send('toggleExpansion', {highlight: true}); }, - toggleSearch() { - this.container.lookup('controller:header').send('toggleSearch'); - return false; + toggleSearch(event) { + this.appEvents.trigger('header:keyboard-trigger', {type: 'search', event}); }, - toggleHamburgerMenu() { - this.container.lookup('controller:header').send('toggleMenuPanel', 'hamburgerVisible'); + toggleHamburgerMenu(event) { + this.appEvents.trigger('header:keyboard-trigger', {type: 'hamburger', event}); }, - showCurrentUser() { - this.container.lookup('controller:header').send('toggleMenuPanel', 'userMenuVisible'); + showCurrentUser(event) { + this.appEvents.trigger('header:keyboard-trigger', {type: 'user', event}); }, showHelpModal() { diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index 178f48e5a9..f1d31936f8 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -9,6 +9,7 @@ import { createWidget, decorateWidget, changeSetting } from 'discourse/widgets/w import { onPageChange } from 'discourse/lib/page-tracker'; import { preventCloak } from 'discourse/widgets/post-stream'; import { h } from 'virtual-dom'; +import { addFlagProperty } from 'discourse/components/site-header'; class PluginApi { constructor(version, container) { @@ -284,11 +285,20 @@ class PluginApi { createWidget(name, args) { return createWidget(name, args); } + + /** + * Adds a property that can be summed for calculating the flag counter + **/ + addFlagProperty(property) { + return addFlagProperty(property); + } + } let _pluginv01; function getPluginApi(version) { - if (version === "0.1" || version === "0.2" || version === "0.3") { + version = parseFloat(version); + if (version <= 0.4) { if (!_pluginv01) { _pluginv01 = new PluginApi(version, Discourse.__container__); } @@ -299,7 +309,7 @@ function getPluginApi(version) { } /** - * withPluginApi(version, apiCode, noApi) + * withPluginApi(version, apiCodeCallback, opts) * * Helper to version our client side plugin API. Pass the version of the API that your * plugin is coded against. If that API is available, the `apiCodeCallback` function will diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6 index b057bcba8c..7954ade89f 100644 --- a/app/assets/javascripts/discourse/routes/application.js.es6 +++ b/app/assets/javascripts/discourse/routes/application.js.es6 @@ -3,6 +3,7 @@ import logout from 'discourse/lib/logout'; import showModal from 'discourse/lib/show-modal'; import OpenComposer from "discourse/mixins/open-composer"; import Category from 'discourse/models/category'; +import mobile from 'discourse/lib/mobile'; function unlessReadOnly(method, message) { return function() { @@ -25,6 +26,22 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, { actions: { + showSearchHelp() { + Discourse.ajax("/static/search_help.html", { dataType: 'html' }).then(model => { + showModal('searchHelp', { model }); + }); + }, + + toggleAnonymous() { + Discourse.ajax("/users/toggle-anon", {method: 'POST'}).then(() => { + window.location.reload(); + }); + }, + + toggleMobileView() { + mobile.toggleMobileView(); + }, + logout: unlessReadOnly('_handleLogout', I18n.t("read_only_mode.logout_disabled")), _collectTitleTokens(tokens) { diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6 index 5576fb422c..47fd25ed7d 100644 --- a/app/assets/javascripts/discourse/routes/discourse.js.es6 +++ b/app/assets/javascripts/discourse/routes/discourse.js.es6 @@ -75,7 +75,6 @@ const DiscourseRoute = Ember.Route.extend({ }); export function cleanDOM() { - if (window.MiniProfiler) { window.MiniProfiler.pageTransition(); } diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index 4297186f07..cd627ce46d 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -179,8 +179,9 @@ const TopicRoute = Discourse.Route.extend({ this.searchService.set('searchContext', null); this.controllerFor('user-card').set('visible', false); - const topicController = this.controllerFor('topic'), - postStream = topicController.get('model.postStream'); + const topicController = this.controllerFor('topic'); + const postStream = topicController.get('model.postStream'); + postStream.cancelFilter(); topicController.set('multiSelect', false); @@ -188,11 +189,7 @@ const TopicRoute = Discourse.Route.extend({ this.controllerFor('composer').set('topic', null); this.screenTrack.stop(); - const headerController = this.controllerFor('header'); - if (headerController) { - headerController.set('topic', null); - headerController.set('showExtraInfo', false); - } + this.appEvents.trigger('header:hide-topic'); }, setupController(controller, model) { @@ -207,7 +204,6 @@ const TopicRoute = Discourse.Route.extend({ TopicRoute.trigger('setupTopicController', this); - this.controllerFor('header').setProperties({ topic: model, showExtraInfo: false }); this.searchService.set('searchContext', model.get('searchContext')); this.controllerFor('composer').set('topic', model); diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs index 99ef6ee552..479d0c2925 100644 --- a/app/assets/javascripts/discourse/templates/application.hbs +++ b/app/assets/javascripts/discourse/templates/application.hbs @@ -1,4 +1,11 @@ -{{render "header"}} +{{site-header canSignUp=canSignUp + showCreateAccount="showCreateAccount" + showLogin="showLogin" + showKeyboard="showKeyboardShortcutsHelp" + toggleMobileView="toggleMobileView" + toggleAnonymous="toggleAnonymous" + logout="logout" + showSearchHelp="showSearchHelp"}}
diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs deleted file mode 100644 index f0bc9397ab..0000000000 --- a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs +++ /dev/null @@ -1,94 +0,0 @@ -{{#menu-panel visible=visible}} - {{#if prioritizeFaq}} - {{#menu-links}} -
  • - {{#d-link path=faqUrl class="faq-link"}} - {{i18n "faq"}} - {{i18n "new_item"}} - {{/d-link}} -
    • - {{/menu-links}} - {{/if}} - - {{#if currentUser.staff}} - {{#menu-links}} -
  • {{d-link route="admin" class="admin-link" icon="wrench" label="admin_title"}}
    • -
  • - {{#d-link route="adminFlags" class="flagged-posts-link"}} - {{fa-icon "flag"}} {{i18n 'flags_title'}} - {{#if currentUser.site_flagged_posts_count}} - {{currentUser.site_flagged_posts_count}} - {{/if}} - {{/d-link}} -
    • - - {{#if currentUser.show_queued_posts}} -
  • - {{#d-link route='queued-posts'}} - {{i18n "queue.title"}} - {{#if currentUser.post_queue_new_count}} - {{currentUser.post_queue_new_count}} - {{/if}} - {{/d-link}} -
    • - {{/if}} - {{#if currentUser.admin}} -
  • {{d-link route="adminSiteSettings" icon="gear" label="admin.site_settings.title"}}
    • - {{/if}} - - {{plugin-outlet "hamburger-admin"}} - {{/menu-links}} - {{/if}} - - {{#menu-links}} -
  • {{d-link route="discovery.latest" class="latest-topics-link" label="filters.latest.title"}}
    • - - {{#if currentUser}} -
  • - {{#if newCount}} - {{d-link route="discovery.new" class="new-topics-link" label="filters.new.title_with_count" count=newCount}} - {{else}} - {{d-link route="discovery.new" class="new-topics-link" label="filters.new.title"}} - {{/if}} -
    • -
  • - {{#if unreadCount}} - {{d-link route="discovery.unread" class="unread-topics-link" label="filters.unread.title_with_count" count=unreadCount}} - {{else}} - {{d-link route="discovery.unread" class="unread-topics-link" label="filters.unread.title"}} - {{/if}} -
    • - {{/if}} -
  • {{d-link route="discovery.top" class="top-topics-link" label="filters.top.title"}}
    • - - {{#if siteSettings.enable_badges}} -
  • {{d-link route="badges" class="badge-link" label="badges.title"}}
    • - {{/if}} - - {{#if showUserDirectoryLink}} -
  • {{d-link route="users" class="user-directory-link" label="directory.title"}}
    • - {{/if}} - - {{plugin-outlet "site-map-links"}} - - {{plugin-outlet "site-map-links-last"}} - {{/menu-links}} - - {{mount-widget widget='hamburger-categories' args=(as-hash categories=categories)}} -
    - - {{#menu-links omitRule="true"}} -
  • {{d-link route="about" class="about-link" label="about.simple_title"}}
    • - {{#unless prioritizeFaq}} -
  • {{d-link path=faqUrl class="faq-link" label="faq"}}
    • - {{/unless}} - - {{#if showKeyboardShortcuts}} -
  • {{d-link action="keyboardShortcuts" class="keyboard-shortcuts-link" label="keyboard_shortcuts_help.title"}}
    • - {{/if}} - - {{#if showMobileToggle}} -
  • {{d-link action="toggleMobileView" class="mobile-toggle-link" label=mobileViewLinkTextKey}}
    • - {{/if}} - {{/menu-links}} -{{/menu-panel}} diff --git a/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs b/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs deleted file mode 100644 index 6cb4af742b..0000000000 --- a/app/assets/javascripts/discourse/templates/components/header-dropdown.hbs +++ /dev/null @@ -1,9 +0,0 @@ - - {{#if showUser}} - {{bound-avatar currentUser "medium"}} - {{else}} - {{fa-icon icon}} - {{/if}} - - -{{yield}} diff --git a/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs b/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs deleted file mode 100644 index 4d5b798753..0000000000 --- a/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs +++ /dev/null @@ -1,21 +0,0 @@ -
    -
    -
    -

    - {{#if showPrivateMessageGlyph}} - - {{fa-icon "envelope"}} - - {{/if}} - - {{#if topic.details.loaded}} - {{topic-status topic=topic}} - {{{topic.fancyTitle}}} - {{/if}} -

    - {{#if topic.details.loaded}} - {{topic-category topic=topic}} - {{/if}} -
    -
    -
    diff --git a/app/assets/javascripts/discourse/templates/components/menu-links.hbs b/app/assets/javascripts/discourse/templates/components/menu-links.hbs deleted file mode 100644 index fe9b872fcb..0000000000 --- a/app/assets/javascripts/discourse/templates/components/menu-links.hbs +++ /dev/null @@ -1,7 +0,0 @@ -
      - {{yield}} -
      -
    -{{#unless omitRule}} -
    -{{/unless}} diff --git a/app/assets/javascripts/discourse/templates/components/menu-panel.hbs b/app/assets/javascripts/discourse/templates/components/menu-panel.hbs deleted file mode 100644 index bbb72a5736..0000000000 --- a/app/assets/javascripts/discourse/templates/components/menu-panel.hbs +++ /dev/null @@ -1,7 +0,0 @@ -{{#if visible}} -
    -
    - {{yield}} -
    -
    -{{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/search-menu.hbs b/app/assets/javascripts/discourse/templates/components/search-menu.hbs deleted file mode 100644 index 1f9cc018a9..0000000000 --- a/app/assets/javascripts/discourse/templates/components/search-menu.hbs +++ /dev/null @@ -1,40 +0,0 @@ -{{#menu-panel visible=visible onVisible="showedSearch" onHidden="cancelHighlight" maxWidth="500"}} - {{plugin-outlet "above-search"}} - {{search-text-field value=searchService.term id="search-term"}} - -
    - {{#if searchService.searchContext}} - - {{/if}} - {{i18n "show_help"}} -
    -
    - {{#if loading}} -
    {{loading-spinner}}
    - {{else}} -
    - {{#if noResults}} -
    - {{i18n "search.no_results"}} -
    - {{else}} - {{#each content.resultTypes as |resultType|}} -
      -
    • {{resultType.name}}
      • - {{component resultType.componentName results=resultType.results term=searchService.term}} -
    -
    - {{#if resultType.moreUrl}} - {{i18n "show_more"}} {{fa-icon "chevron-down"}} - {{/if}} - {{#if resultType.more}} - {{i18n "show_more"}} {{fa-icon "chevron-down"}} - {{/if}} -
    - {{/each}} - {{/if}} -
    - {{/if}} -{{/menu-panel}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-category.hbs b/app/assets/javascripts/discourse/templates/components/search-result-category.hbs deleted file mode 100644 index 071eba1841..0000000000 --- a/app/assets/javascripts/discourse/templates/components/search-result-category.hbs +++ /dev/null @@ -1,7 +0,0 @@ -{{#each results as |result|}} -
  • - - {{category-badge result}} - -
    • -{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-post.hbs b/app/assets/javascripts/discourse/templates/components/search-result-post.hbs deleted file mode 100644 index f89090ac24..0000000000 --- a/app/assets/javascripts/discourse/templates/components/search-result-post.hbs +++ /dev/null @@ -1,14 +0,0 @@ -{{#each results as |result|}} -
  • - - - {{i18n 'search.post_format' post_number=result.post_number username=result.username}} - - {{#unless site.mobileView}} - - {{{unbound result.blurb}}} - - {{/unless}} - -
    • -{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs b/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs deleted file mode 100644 index 132e56360b..0000000000 --- a/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs +++ /dev/null @@ -1,14 +0,0 @@ -{{#each results as |result|}} -
  • - - - {{topic-status topic=result.topic disableActions=true}}{{{unbound result.topic.fancyTitle}}}{{category-badge result.topic.category}}{{plugin-outlet "search-category"}} - - {{#unless site.mobileView}} - - {{format-age result.created_at}} - {{{unbound result.blurb}}} - - {{/unless}} - -
    • -{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-user.hbs b/app/assets/javascripts/discourse/templates/components/search-result-user.hbs deleted file mode 100644 index 9cf46a1519..0000000000 --- a/app/assets/javascripts/discourse/templates/components/search-result-user.hbs +++ /dev/null @@ -1,8 +0,0 @@ -{{#each results as |result|}} -
  • - - {{avatar result imageSize="small"}} - {{unbound result.username}} - -
    • -{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/user-menu.hbs b/app/assets/javascripts/discourse/templates/components/user-menu.hbs deleted file mode 100644 index 6f014d80d2..0000000000 --- a/app/assets/javascripts/discourse/templates/components/user-menu.hbs +++ /dev/null @@ -1,48 +0,0 @@ -{{#menu-panel visible=visible}} -
    -
      - - {{#if showDisableAnon}} -
    • {{d-link route='user' model=currentUser class="user-activity-link" icon="user" label="user.profile"}}
      • -
    • {{d-link action="toggleAnon" label="switch_from_anon"}}
      • - {{else}} -
    • {{d-link route='user' model=currentUser class="user-activity-link" icon="user" translateLabel="false" label=currentUser.username}}
      • - {{/if}} -
    • - {{d-link path=bookmarksPath title="user.bookmarks" icon="bookmark"}} - {{#if siteSettings.enable_private_messages}} - {{d-link path=messagesPath title="user.private_messages" icon="envelope"}} - {{/if}} - {{#if showEnableAnon}} - {{d-link action="toggleAnon" title="switch_to_anon" icon="user-secret"}} - {{/if}} - {{d-link path=preferencesPath title="user.preferences" icon="gear"}} -
      • -
    -
    - -
    - {{#conditional-loading-spinner condition=loadingNotifications containerClass="spinner-container"}} - {{#if notifications}} -
    -
      - {{#each notifications as |n|}} - {{notification-item notification=n}} - {{/each}} -
    • - {{#d-link path=notificationsPath}} - {{i18n 'notifications.more'}}… - {{/d-link}} -
      • -
    - {{/if}} - {{/conditional-loading-spinner}} -
    - {{plugin-outlet "user-menu-bottom"}} -
    -
    -
      -
    • {{d-link action="logout" class="logout" icon="sign-out" label="user.log_out"}}
      • -
    -
    -{{/menu-panel}} diff --git a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs similarity index 64% rename from app/assets/javascripts/discourse/templates/composer/similar_topics.hbs rename to app/assets/javascripts/discourse/templates/composer/similar-topics.hbs index ed326e488e..257a51ebf1 100644 --- a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs +++ b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs @@ -2,5 +2,5 @@

    {{i18n 'composer.similar_topics'}}

      - {{search-result-topic results=similarTopics}} + {{mount-widget widget="search-result-topic" args=(as-hash results=similarTopics)}}
    diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs deleted file mode 100644 index ad1af73529..0000000000 --- a/app/assets/javascripts/discourse/templates/header.hbs +++ /dev/null @@ -1,66 +0,0 @@ -
    -
    - {{home-logo minimized=showExtraInfo}} - {{plugin-outlet "header-after-home-logo"}} - -
    - {{#unless currentUser}} - {{#if showSignUpButton}} - {{d-button action="showCreateAccount" class="btn-primary btn-small sign-up-button" label="sign_up"}} - {{/if}} - {{d-button action="showLogin" class="btn-primary btn-small login-button" icon="user" label="log_in"}} - {{/unless}} - - {{plugin-outlet "header-before-dropdowns"}} - {{user-menu visible=userMenuVisible logoutAction="logout"}} - {{hamburger-menu visible=hamburgerVisible showKeyboardAction="showKeyboardShortcutsHelp"}} - {{search-menu visible=searchVisible}} -
    - - {{#if showExtraInfo}} - {{header-extra-info topic=topic}} - {{/if}} -
    -
    -{{plugin-outlet "header-under-content"}} diff --git a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs index 9ca0b0b99b..5d2e184b81 100644 --- a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs +++ b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs @@ -14,14 +14,7 @@
    {{/if}} -{{#each n in model}} -
    - {{notification-item notification=n}} - - {{format-date n.created_at leaveAgo="true"}} - -
    -{{/each}} +{{user-notifications-large notifications=model}} {{#conditional-loading-spinner condition=loading}} {{#unless model.canLoadMore}} diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs index 385e029b6b..bfdba81bee 100644 --- a/app/assets/javascripts/discourse/templates/user/notifications.hbs +++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs @@ -23,5 +23,7 @@
    - {{outlet}} + {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action="loadMore"}} + {{outlet}} + {{/load-more}}
    diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index a08ad2c764..4bc6b5499d 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -1,6 +1,6 @@ import afterTransition from 'discourse/lib/after-transition'; import positioningWorkaround from 'discourse/lib/safari-hacks'; -import { headerHeight } from 'discourse/views/header'; +import { headerHeight } from 'discourse/components/site-header'; import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators'; import Composer from 'discourse/models/composer'; diff --git a/app/assets/javascripts/discourse/views/header.js.es6 b/app/assets/javascripts/discourse/views/header.js.es6 deleted file mode 100644 index eb5ebec50f..0000000000 --- a/app/assets/javascripts/discourse/views/header.js.es6 +++ /dev/null @@ -1,55 +0,0 @@ -import { on } from 'ember-addons/ember-computed-decorators'; - -export default Ember.View.extend({ - tagName: 'header', - classNames: ['d-header', 'clearfix'], - classNameBindings: ['editingTopic'], - templateName: 'header', - - examineDockHeader() { - // Check the dock after the current run loop. While rendering, - // it's much slower to calculate `outlet.offset()` - Ember.run.next(() => { - if (this.docAt === undefined) { - const outlet = $('#main-outlet'); - if (!(outlet && outlet.length === 1)) return; - this.docAt = outlet.offset().top; - } - - const offset = window.pageYOffset || $('html').scrollTop(); - if (offset >= this.docAt) { - if (!this.dockedHeader) { - $('body').addClass('docked'); - this.dockedHeader = true; - } - } else { - if (this.dockedHeader) { - $('body').removeClass('docked'); - this.dockedHeader = false; - } - } - }); - }, - - @on('willDestroyElement') - _tearDown() { - $(window).unbind('scroll.discourse-dock'); - $(document).unbind('touchmove.discourse-dock'); - this.$('a.unread-private-messages, a.unread-notifications, a[data-notifications]').off('click.notifications'); - $('body').off('keydown.header'); - }, - - @on('didInsertElement') - _setup() { - $(window).bind('scroll.discourse-dock', () => this.examineDockHeader()); - $(document).bind('touchmove.discourse-dock', () => this.examineDockHeader()); - this.examineDockHeader(); - } -}); - -export function headerHeight() { - const $header = $('header.d-header'); - const headerOffset = $header.offset(); - const headerOffsetTop = (headerOffset) ? headerOffset.top : 0; - return parseInt($header.outerHeight() + headerOffsetTop - $(window).scrollTop()); -} diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6 index 96cdf5826d..0148b4347b 100644 --- a/app/assets/javascripts/discourse/views/topic.js.es6 +++ b/app/assets/javascripts/discourse/views/topic.js.es6 @@ -23,6 +23,8 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli postStream: Em.computed.alias('topic.postStream'), archetype: Em.computed.alias('topic.archetype'), + _lastShowTopic: null, + _composeChanged: function() { const composerController = Discourse.get('router.composerController'); composerController.clearState(); @@ -73,7 +75,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli this.resetExamineDockCache(); // this happens after route exit, stuff could have trickled in - this.set('controller.controllers.header.showExtraInfo', false); + this.appEvents.trigger('header:hide-topic'); }.on('willDestroyElement'), @@ -90,6 +92,14 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli offset: 0, hasScrolled: Em.computed.gt("offset", 0), + showTopicInHeader(topic, offset) { + if (this.get('docAt')) { + return offset >= this.get('docAt') || topic.get('postStream.firstPostNotLoaded'); + } else { + return topic.get('postStream.firstPostNotLoaded'); + } + }, + // The user has scrolled the window, or it is finished rendering and ready for processing. scrolled() { if (this.isDestroyed || this.isDestroying || this._state !== 'inDOM') { @@ -106,12 +116,16 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli this.set("offset", offset); - const headerController = this.get('controller.controllers.header'), - topic = this.get('controller.model'); - if (this.get('docAt')) { - headerController.set('showExtraInfo', offset >= this.get('docAt') || topic.get('postStream.firstPostNotLoaded')); - } else { - headerController.set('showExtraInfo', topic.get('postStream.firstPostNotLoaded')); + const topic = this.get('controller.model'); + const showTopic = this.showTopicInHeader(topic, offset); + if (showTopic !== this._lastShowTopic) { + this._lastShowTopic = showTopic; + + if (showTopic) { + this.appEvents.trigger('header:show-topic', topic); + } else { + this.appEvents.trigger('header:hide-topic'); + } } // Trigger a scrolled event diff --git a/app/assets/javascripts/discourse/views/user-notifications.js.es6 b/app/assets/javascripts/discourse/views/user-notifications.js.es6 deleted file mode 100644 index c674102044..0000000000 --- a/app/assets/javascripts/discourse/views/user-notifications.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - eyelineSelector: '.user-stream .notification', - classNames: ['user-stream', 'notification-history'] -}); diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 index b776b9a5eb..55fb1043c8 100644 --- a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 +++ b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 @@ -61,6 +61,7 @@ createWidget('action-link', { createWidget('actions-summary-item', { tagName: 'div.post-action', + buildKey: (attrs) => `actions-summary-item-${attrs.id}`, defaultState() { return { users: [] }; diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6 index 5b4f6e1194..656fc4c1e8 100644 --- a/app/assets/javascripts/discourse/widgets/button.js.es6 +++ b/app/assets/javascripts/discourse/widgets/button.js.es6 @@ -14,6 +14,8 @@ export default createWidget('button', { let title; if (attrs.title) { title = I18n.t(attrs.title, attrs.titleOptions); + } else if (attrs.label) { + title = I18n.t(attrs.label, attrs.labelOptions); } const attributes = { "aria-label": title, title }; diff --git a/app/assets/javascripts/discourse/widgets/click-hook.js.es6 b/app/assets/javascripts/discourse/widgets/click-hook.js.es6 deleted file mode 100644 index 16f1f4124a..0000000000 --- a/app/assets/javascripts/discourse/widgets/click-hook.js.es6 +++ /dev/null @@ -1,64 +0,0 @@ -/*eslint no-loop-func:0*/ - -const CLICK_ATTRIBUTE_NAME = '_discourse_click_widget'; -const CLICK_OUTSIDE_ATTRIBUTE_NAME = '_discourse_click_outside_widget'; - -export class WidgetClickHook { - constructor(widget) { - this.widget = widget; - } - - hook(node) { - node[CLICK_ATTRIBUTE_NAME] = this.widget; - } - - unhook(node) { - node[CLICK_ATTRIBUTE_NAME] = null; - } -}; - -export class WidgetClickOutsideHook { - constructor(widget) { - this.widget = widget; - } - - hook(node) { - node.setAttribute('data-click-outside', true); - node[CLICK_OUTSIDE_ATTRIBUTE_NAME] = this.widget; - } - - unhook(node) { - node.removeAttribute('data-click-outside'); - node[CLICK_OUTSIDE_ATTRIBUTE_NAME] = null; - } -}; - -let _watchingDocument = false; -WidgetClickHook.setupDocumentCallback = function() { - if (_watchingDocument) { return; } - - $(document).on('click.discourse-widget', e => { - let node = e.target; - while (node) { - const widget = node[CLICK_ATTRIBUTE_NAME]; - if (widget) { - widget.rerenderResult(() => widget.click(e)); - break; - } - node = node.parentNode; - } - - node = e.target; - const $outside = $('[data-click-outside]'); - $outside.each((i, outNode) => { - if (outNode.contains(node)) { return; } - const widget = outNode[CLICK_OUTSIDE_ATTRIBUTE_NAME]; - if (widget) { - widget.clickOutside(e); - } - }); - }); - - - _watchingDocument = true; -}; diff --git a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 index cb86752c36..ec14630d74 100644 --- a/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 +++ b/app/assets/javascripts/discourse/widgets/hamburger-categories.js.es6 @@ -5,7 +5,7 @@ createWidget('hamburger-category', { tagName: 'li.category-link', html(c) { - const results = [ this.attach('category_link', { category: c, allowUncategorized: true }) ]; + const results = [ this.attach('category-link', { category: c, allowUncategorized: true }) ]; const unreadTotal = parseInt(c.get('unreadTopics'), 10) + parseInt(c.get('newTopics'), 10); if (unreadTotal) { diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 new file mode 100644 index 0000000000..ca9a925b0f --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 @@ -0,0 +1,158 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; + +export default createWidget('hamburger-menu', { + tagName: 'div.hamburger-panel', + + faqLink(href) { + return h('a.faq-priority', { attributes: { href } }, [ + I18n.t('faq'), + ' ', + h('span.badge.badge-notification', I18n.t('new_item')) + ]); + }, + + adminLinks() { + const { currentUser } = this; + + const links = [{ route: 'admin', className: 'admin-link', icon: 'wrench', label: 'admin_title' }, + { route: 'adminFlags', + className: 'flagged-posts-link', + icon: 'flag', + label: 'flags_title', + badgeClass: 'flagged-posts', + badgeTitle: 'notifications.total_flagged', + badgeCount: 'site_flagged_posts_count' }]; + + if (currentUser.show_queued_posts) { + links.push({ route: 'queued-posts', + className: 'queued-posts-link', + label: 'queue.title', + badgeCount: 'post_queue_new_count', + badgeClass: 'queued-posts' }); + } + + if (currentUser.admin) { + links.push({ route: 'adminSiteSettings', + icon: 'gear', + label: 'admin.site_settings.title', + className: 'settings-link' }); + } + + return links.map(l => this.attach('link', l)); + }, + + lookupCount(type) { + const tts = this.container.lookup('topic-tracking-state:main'); + return tts ? tts.lookupCount(type) : 0; + }, + + showUserDirectory() { + if (!this.siteSettings.enable_user_directory) return false; + if (this.siteSettings.hide_user_profiles_from_public && !this.currentUser) return false; + return true; + }, + + generalLinks() { + const { siteSettings } = this; + const links = []; + + links.push({ route: 'discovery.latest', className: 'latest-topics-link', label: 'filters.latest.title' }); + + if (this.currentUser) { + links.push({ route: 'discovery.new', + className: 'new-topics-link', + labelCount: 'filters.new.title_with_count', + label: 'filters.new.title', + count: this.lookupCount('new') }); + + links.push({ route: 'discovery.unread', + className: 'unread-topics-link', + labelCount: 'filters.unread.title_with_count', + label: 'filters.unread.title', + count: this.lookupCount('unread') }); + } + + links.push({ route: 'discovery.top', className: 'top-topics-link', label: 'filters.top.title' }); + + if (siteSettings.enable_badges) { + links.push({ route: 'badges', className: 'badge-link', label: 'badges.title' }); + } + + if (this.showUserDirectory()) { + links.push({ route: 'users', className: 'user-directory-link', label: 'directory.title' }); + } + + return links.map(l => this.attach('link', l)); + }, + + listCategories() { + const hideUncategorized = !this.siteSettings.allow_uncategorized_topics; + const showSubcatList = this.siteSettings.show_subcategory_list; + const isStaff = Discourse.User.currentProp('staff'); + + const categories = Discourse.Category.list().reject((c) => { + if (showSubcatList && c.get('parent_category_id')) { return true; } + if (hideUncategorized && c.get('isUncategorizedCategory') && !isStaff) { return true; } + return false; + }); + + return this.attach('hamburger-categories', { categories }); + }, + + footerLinks(prioritizeFaq, faqUrl) { + const links = []; + links.push({ route: 'about', className: 'about-link', label: 'about.simple_title' }); + + if (!prioritizeFaq) { + links.push({ href: faqUrl, className: 'faq-link', label: 'faq' }); + } + + const { site } = this; + if (!site.mobileView && !this.capabilities.touch) { + links.push({ action: 'showKeyboard', className: 'keyboard-shortcuts-link', label: 'keyboard_shortcuts_help.title' }); + } + + if (this.site.mobileView || (this.siteSettings.enable_mobile_theme && this.capabilities.touch)) { + links.push({ action: 'toggleMobileView', + className: 'mobile-toggle-link', + label: this.site.mobileView ? "desktop_view" : "mobile_view" }); + } + + return links.map(l => this.attach('link', l)); + }, + + panelContents() { + const { currentUser } = this; + const results = []; + + let faqUrl = this.siteSettings.faq_url; + if (!faqUrl || faqUrl.length === 0) { + faqUrl = Discourse.getURL('/faq'); + } + + const prioritizeFaq = this.currentUser && !this.currentUser.read_faq; + if (prioritizeFaq) { + results.push(this.attach('menu-links', { heading: true, contents: () => this.faqLink(faqUrl) })); + } + + if (currentUser && currentUser.staff) { + results.push(this.attach('menu-links', { contents: () => this.adminLinks() })); + } + + results.push(this.attach('menu-links', { contents: () => this.generalLinks() })); + results.push(this.listCategories()); + results.push(h('hr')); + results.push(this.attach('menu-links', { omitRule: true, contents: () => this.footerLinks(prioritizeFaq, faqUrl) })); + + return results; + }, + + html() { + return this.attach('menu-panel', { contents: () => this.panelContents() }); + }, + + clickOutside() { + this.sendWidgetAction('toggleHamburger'); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 new file mode 100644 index 0000000000..94cbf746db --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 @@ -0,0 +1,54 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import DiscourseURL from 'discourse/lib/url'; + +export default createWidget('header-topic-info', { + tagName: 'div.extra-info-wrapper', + + html(attrs) { + const topic = attrs.topic; + + const heading = []; + + const showPM = !topic.get('is_warning') && topic.get('isPrivateMessage'); + if (showPM) { + const href = this.currentUser && this.currentUser.pmPath(topic); + if (href) { + heading.push(h('a', { attributes: { href } }, + h('span.private-message-glyph', iconNode('envelope')))); + } + } + const loaded = topic.get('details.loaded'); + + if (loaded) { + heading.push(this.attach('topic-status', attrs)); + heading.push(this.attach('link', { className: 'topic-link', + action: 'jumpToTopPost', + href: topic.get('url'), + contents: () => topic.get('fancyTitle') })); + } + + const title = [h('h1', heading)]; + if (loaded) { + const category = topic.get('category'); + if (category && (!category.get('isUncategorizedCategory') || !this.siteSettings.suppress_uncategorized_badge)) { + const parentCategory = category.get('parentCategory'); + if (parentCategory) { + title.push(this.attach('category-link', { category: parentCategory })); + } + title.push(this.attach('category-link', { category })); + } + } + + const contents = h('div.title-wrapper', title); + return h('div.extra-info', { className: title.length > 1 ? 'two-rows' : '' }, contents); + }, + + jumpToTopPost() { + const topic = this.attrs.topic; + if (topic) { + DiscourseURL.routeTo(topic.get('firstPostUrl')); + } + } +}); diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 new file mode 100644 index 0000000000..314acd1ec7 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -0,0 +1,278 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { avatarImg } from 'discourse/widgets/post'; +import DiscourseURL from 'discourse/lib/url'; + +import { h } from 'virtual-dom'; + +const dropdown = { + buildClasses(attrs) { + if (attrs.active) { return "active"; } + }, + + click(e) { + e.preventDefault(); + if (!this.attrs.active) { + this.sendWidgetAction(this.attrs.action); + } + } +}; + +createWidget('header-notifications', { + html(attrs) { + const { currentUser } = this; + + const contents = [ avatarImg('medium', { template: currentUser.get('avatar_template'), + username: currentUser.get('username') }) ]; + + const unreadNotifications = currentUser.get('unread_notifications'); + if (!!unreadNotifications) { + contents.push(this.attach('link', { action: attrs.action, + className: 'badge-notification unread-notifications', + rawLabel: unreadNotifications })); + } + + const unreadPMs = currentUser.get('unread_private_messages'); + if (!!unreadPMs) { + contents.push(this.attach('link', { action: attrs.action, + className: 'badge-notification unread-private-messages', + rawLabel: unreadPMs })); + } + + return contents; + } +}); + +createWidget('user-dropdown', jQuery.extend(dropdown, { + tagName: 'li.header-dropdown-toggle.current-user', + + buildId() { + return 'current-user'; + }, + + html(attrs) { + const { currentUser } = this; + + return h('a.icon', { attributes: { href: currentUser.get('path'), 'data-auto-route': true } }, + this.attach('header-notifications', attrs)); + } +})); + +createWidget('header-dropdown', jQuery.extend(dropdown, { + tagName: 'li.header-dropdown-toggle', + + html(attrs) { + const title = I18n.t(attrs.title); + + const body = [iconNode(attrs.icon)]; + if (attrs.contents) { + body.push(attrs.contents.call(this)); + } + + return h('a.icon', { attributes: { href: '', + 'data-auto-route': true, + title, + 'aria-label': title, + id: attrs.iconId } }, body); + } +})); + +createWidget('header-icons', { + tagName: 'ul.icons.clearfix', + + buildAttributes() { + return { role: 'navigation' }; + }, + + html(attrs) { + const hamburger = this.attach('header-dropdown', { + title: 'hamburger_menu', + icon: 'bars', + iconId: 'toggle-hamburger-menu', + active: attrs.hamburgerVisible, + action: 'toggleHamburger', + contents() { + if (!attrs.flagCount) { return; } + return this.attach('link', { + href: '/admin/flags/active', + title: 'notifications.total_flagged', + rawLabel: attrs.flagCount, + className: 'badge-notification flagged-posts' + }); + } + }); + + const search = this.attach('header-dropdown', { + title: 'search.title', + icon: 'search', + iconId: 'search-button', + action: 'toggleSearchMenu', + active: attrs.searchVisible, + href: '/search' + }); + + const icons = [search, hamburger]; + if (this.currentUser) { + icons.push(this.attach('user-dropdown', { active: attrs.userVisible, + action: 'toggleUserMenu' })); + } + + return icons; + }, +}); + +createWidget('header-buttons', { + tagName: 'span', + + html(attrs) { + if (this.currentUser) { return; } + + const buttons = []; + + if (attrs.canSignUp && !attrs.topic) { + buttons.push(this.attach('button', { label: "sign_up", + className: 'btn-primary btn-small sign-up-button', + action: "showCreateAccount" })); + } + + + buttons.push(this.attach('button', { label: 'log_in', + className: 'btn-primary btn-small login-button', + action: 'showLogin', + icon: 'user' })); + return buttons; + } +}); + +export default createWidget('header', { + tagName: 'header.d-header.clearfix', + buildKey: () => `header`, + + defaultState() { + return { searchVisible: false, + hamburgerVisible: false, + userVisible: false, + contextEnabled: false }; + }, + + html(attrs, state) { + const panels = [this.attach('header-buttons', attrs), + this.attach('header-icons', { hamburgerVisible: state.hamburgerVisible, + userVisible: state.userVisible, + searchVisible: state.searchVisible, + flagCount: attrs.flagCount })]; + + if (state.searchVisible) { + panels.push(this.attach('search-menu', { contextEnabled: state.contextEnabled })); + } else if (state.hamburgerVisible) { + panels.push(this.attach('hamburger-menu')); + } else if (state.userVisible) { + panels.push(this.attach('user-menu')); + } + + const contents = [ this.attach('home-logo', { minimized: !!attrs.topic }), + h('div.panel.clearfix', panels) ]; + + if (attrs.topic) { + contents.push(this.attach('header-topic-info', attrs)); + } + + return h('div.wrap', h('div.contents.clearfix', contents)); + }, + + updateHighlight() { + if (!this.state.searchVisible) { + const service = this.container.lookup('search-service:main'); + service.set('highlightTerm', ''); + } + }, + + linkClickedEvent() { + this.state.userVisible = false; + this.state.hamburgerVisible = false; + this.state.searchVisible = false; + this.updateHighlight(); + }, + + toggleSearchMenu() { + if (this.site.mobileView) { + const searchService = this.container.lookup('search-service:main'); + const context = searchService.get('searchContext'); + var params = ""; + + if (context) { + params = `?context=${context.type}&context_id=${context.id}&skip_context=true`; + } + + return DiscourseURL.routeTo('/search' + params); + } + + this.state.searchVisible = !this.state.searchVisible; + this.updateHighlight(); + Ember.run.next(() => $('#search-term').focus()); + }, + + toggleUserMenu() { + this.state.userVisible = !this.state.userVisible; + }, + + toggleHamburger() { + this.state.hamburgerVisible = !this.state.hamburgerVisible; + }, + + togglePageSearch() { + const { state } = this; + + if (state.searchVisible) { + this.toggleSearchMenu(); + return false; + } + + state.contextEnabled = false; + + const currentPath = this.container.lookup('controller:application').get('currentPath'); + const blacklist = [ /^discovery\.categories/ ]; + const whitelist = [ /^topic\./ ]; + const check = function(regex) { return !!currentPath.match(regex); }; + let showSearch = whitelist.any(check) && !blacklist.any(check); + + // If we're viewing a topic, only intercept search if there are cloaked posts + if (showSearch && currentPath.match(/^topic\./)) { + showSearch = ($('.topic-post .cooked, .small-action:not(.time-gap)').length < + this.container.lookup('controller:topic').get('model.postStream.stream.length')); + } + + if (showSearch) { + state.contextEnabled = true; + this.toggleSearchMenu(); + return false; + } + + return true; + }, + + searchMenuContextChanged(value) { + this.state.contextEnabled = value; + }, + + headerKeyboardTrigger(msg) { + switch(msg.type) { + case 'search': + this.toggleSearchMenu(); + break; + case 'user': + this.toggleUserMenu(); + break; + case 'hamburger': + this.toggleHamburger(); + break; + case 'page-search': + if (!this.togglePageSearch()) { + msg.event.preventDefault(); + msg.event.stopPropagation(); + } + break; + } + } + +}); diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 new file mode 100644 index 0000000000..1a2f01f40a --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 @@ -0,0 +1,48 @@ +import DiscourseURL from 'discourse/lib/url'; +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { iconNode } from 'discourse/helpers/fa-icon'; + +export default createWidget('home-logo', { + tagName: 'div.title', + + logo() { + const { siteSettings } = this; + const mobileView = this.site.mobileView; + + const mobileLogoUrl = siteSettings.mobile_logo_url || ""; + const showMobileLogo = mobileView && (mobileLogoUrl.length > 0); + + const logoUrl = siteSettings.logo_url || ''; + const title = siteSettings.title; + + if (!mobileView && this.attrs.minimized) { + const logoSmallUrl = siteSettings.logo_small_url || ''; + if (logoSmallUrl.length) { + return h('img#site-logo.logo-small', { attributes: { src: logoSmallUrl, width: 33, height: 33, alt: title } }); + } else { + return iconNode('home'); + } + } else if (showMobileLogo) { + return h('img#site-logo.logo-big', { attributes: { src: mobileLogoUrl, alt: title } }); + } else if (logoUrl.length) { + return h('img#site-logo.logo-big', { attributes: { src: logoUrl, alt: title } }); + } else { + return h('h2#site-text-logo.text-logo', title); + } + }, + + html() { + return h('a', { attributes: { href: "/", 'data-auto-route': true } }, this.logo()); + }, + + click(e) { + // if they want to open in a new tab, let it so + if (e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) { return true; } + + e.preventDefault(); + + DiscourseURL.routeTo("/"); + return false; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/hooks.js.es6 b/app/assets/javascripts/discourse/widgets/hooks.js.es6 new file mode 100644 index 0000000000..669eac77b5 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/hooks.js.es6 @@ -0,0 +1,67 @@ +/*eslint no-loop-func:0*/ + +const CLICK_ATTRIBUTE_NAME = '_discourse_click_widget'; +const CLICK_OUTSIDE_ATTRIBUTE_NAME = '_discourse_click_outside_widget'; +const KEY_UP_ATTRIBUTE_NAME = '_discourse_key_up_widget'; + +function buildHook(attributeName, setAttr) { + return class { + constructor(widget) { + this.widget = widget; + } + + hook(node) { + if (setAttr) { + node.setAttribute(setAttr, true); + } + node[attributeName] = this.widget; + } + + unhook(node) { + if (setAttr) { + node.removeAttribute(setAttr, true); + } + node[attributeName] = null; + } + }; +} + +export const WidgetClickHook = buildHook(CLICK_ATTRIBUTE_NAME); +export const WidgetClickOutsideHook = buildHook(CLICK_OUTSIDE_ATTRIBUTE_NAME, 'data-click-outside'); +export const WidgetKeyUpHook = buildHook(KEY_UP_ATTRIBUTE_NAME); + +function findNode(node, attrName, cb) { + while (node) { + const widget = node[attrName]; + if (widget) { + widget.rerenderResult(() => cb(widget)); + break; + } + node = node.parentNode; + } +} + +let _watchingDocument = false; +WidgetClickHook.setupDocumentCallback = function() { + if (_watchingDocument) { return; } + + $(document).on('click.discourse-widget', e => { + findNode(e.target, CLICK_ATTRIBUTE_NAME, w => w.click(e)); + + let node = e.target; + const $outside = $('[data-click-outside]'); + $outside.each((i, outNode) => { + if (outNode.contains(node)) { return; } + const widget = outNode[CLICK_OUTSIDE_ATTRIBUTE_NAME]; + if (widget) { + widget.clickOutside(e); + } + }); + }); + + $(document).on('keyup.discourse-widget', e => { + findNode(e.target, KEY_UP_ATTRIBUTE_NAME, w => w.keyUp(e)); + }); + + _watchingDocument = true; +}; diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6 new file mode 100644 index 0000000000..49ccb07a56 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/link.js.es6 @@ -0,0 +1,84 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { h } from 'virtual-dom'; +import DiscourseURL from 'discourse/lib/url'; + +export default createWidget('link', { + tagName: 'a', + + href(attrs) { + const route = attrs.route; + if (route) { + const router = this.container.lookup('router:main'); + if (router && router.router) { + const params = [route]; + if (attrs.model) { + params.push(attrs.model); + } + return Discourse.getURL(router.router.generate.apply(router.router, params)); + } + } else { + return attrs.href; + } + }, + + buildClasses(attrs) { + const result = []; + result.push('widget-link'); + if (attrs.className) { result.push(attrs.className); }; + return result; + }, + + buildAttributes(attrs) { + return { href: this.href(attrs), title: this.label(attrs) }; + }, + + label(attrs) { + if (attrs.labelCount && attrs.count) { + return I18n.t(attrs.labelCount, { count: attrs.count }); + } + return attrs.rawLabel || (attrs.label ? I18n.t(attrs.label) : ''); + }, + + html(attrs) { + if (attrs.contents) { + return attrs.contents(); + } + + const result = []; + if (attrs.icon) { + result.push(iconNode(attrs.icon)); + result.push(' '); + } + + if (!attrs.hideLabel) { + result.push(this.label(attrs)); + } + + const currentUser = this.currentUser; + if (currentUser && attrs.badgeCount) { + const val = parseInt(currentUser.get(attrs.badgeCount)); + if (val > 0) { + const title = attrs.badgeTitle ? I18n.t(attrs.badgeTitle) : ''; + result.push(' '); + result.push(h('span.badge-notification', { className: attrs.badgeClass, + attributes: { title } }, val)); + } + } + + return result; + }, + + click(e) { + e.preventDefault(); + + if (this.attrs.action) { + e.preventDefault(); + return this.sendWidgetAction(this.attrs.action, this.attrs.actionParam); + } else { + this.sendWidgetEvent('linkClicked'); + } + + return DiscourseURL.routeTo(this.href(this.attrs)); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 b/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 new file mode 100644 index 0000000000..8a1ede9663 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/menu-panel.js.es6 @@ -0,0 +1,32 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; + +createWidget('menu-links', { + html(attrs) { + const links = [].concat(attrs.contents()); + const liOpts = { className: attrs.heading ? 'heading' : '' }; + + const result = []; + result.push(h('ul.menu-links.columned', links.map(l => h('li', liOpts, l)))); + + result.push(h('div.clearfix')); + if (!attrs.omitRule) { + result.push(h('hr')); + } + return result; + } +}); + +createWidget('menu-panel', { + tagName: 'div.menu-panel', + + buildAttributes(attrs) { + if (attrs.maxWidth) { + return { 'data-max-width': attrs.maxWidth }; + } + }, + + html(attrs) { + return h('div.panel-body', h('div.panel-body-contents.clearfix', attrs.contents())); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 new file mode 100644 index 0000000000..108e757b88 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 @@ -0,0 +1,109 @@ +import RawHtml from 'discourse/widgets/raw-html'; +import { createWidget } from 'discourse/widgets/widget'; +import DiscourseURL from 'discourse/lib/url'; +import { h } from 'virtual-dom'; + +const LIKED_TYPE = 5; +const INVITED_TYPE = 8; +const GROUP_SUMMARY_TYPE = 16; + +createWidget('notification-item', { + tagName: 'li', + + buildClasses(attrs) { + const classNames = []; + if (attrs.get('read')) { classNames.push('read'); } + if (attrs.is_warning) { classNames.push('is-warning'); } + return classNames; + }, + + url() { + const attrs = this.attrs; + const data = attrs.data; + + const badgeId = data.badge_id; + if (badgeId) { + let badgeSlug = data.badge_slug; + + if (!badgeSlug) { + const badgeName = data.badge_name; + badgeSlug = badgeName.replace(/[^A-Za-z0-9_]+/g, '-').toLowerCase(); + } + + let username = data.username; + username = username ? "?username=" + username.toLowerCase() : ""; + return Discourse.getURL('/badges/' + badgeId + '/' + badgeSlug + username); + } + + const topicId = attrs.topic_id; + if (topicId) { + return Discourse.Utilities.postUrl(attrs.slug, topicId, attrs.post_number); + } + + if (attrs.notification_type === INVITED_TYPE) { + return Discourse.getURL('/users/' + data.display_username); + } + + if (data.group_id) { + return Discourse.getURL('/users/' + data.username + '/messages/group/' + data.group_name); + } + }, + + description() { + const data = this.attrs.data; + const badgeName = data.badge_name; + if (badgeName) { return Discourse.Utilities.escapeExpression(badgeName); } + + const title = data.topic_title; + return Ember.isEmpty(title) ? "" : Discourse.Utilities.escapeExpression(title); + }, + + text() { + const attrs = this.attrs; + const data = attrs.data; + + const notificationType = attrs.notification_type; + + const lookup = this.site.get('notificationLookup'); + const notName = lookup[notificationType]; + const scope = (notName === 'custom') ? data.message : `notifications.${notName}`; + + if (notificationType === GROUP_SUMMARY_TYPE) { + const count = data.inbox_count; + const group_name = data.group_name; + return I18n.t(scope, { count, group_name }); + } + + const username = data.display_username; + const description = this.description(); + if (notificationType === LIKED_TYPE && data.count > 1) { + const count = data.count - 2; + const username2 = data.username2; + if (count===0) { + return I18n.t('notifications.liked_2', {description, username, username2}); + } else { + return I18n.t('notifications.liked_many', {description, username, username2, count}); + } + } + + return I18n.t(scope, {description, username}); + }, + + html() { + const contents = new RawHtml({ html: `
    ${Discourse.Emoji.unescape(this.text())}
    ` }); + const url = this.url(); + return url ? h('a', { attributes: { href: url, 'data-auto-route': true } }, contents) : contents; + }, + + click(e) { + e.preventDefault(); + this.attrs.set('read', true); + const id = this.attrs.id; + Discourse.setTransientHeader("Discourse-Clear-Notifications", id); + if (document && document.cookie) { + document.cookie = `cn=${id}; expires=Fri, 31 Dec 9999 23:59:59 GMT`; + } + this.sendWidgetEvent('linkClicked'); + DiscourseURL.routeTo(this.url()); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 b/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 index 61d7f973e0..81443e10bc 100644 --- a/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-gutter.js.es6 @@ -7,6 +7,7 @@ const MAX_GUTTER_LINKS = 5; export default createWidget('post-gutter', { tagName: 'div.gutter', + buildKey: (attrs) => `post-gutter-${attrs.id}`, defaultState() { return { collapsed: true }; diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6 index 0cf321bcfe..7dcd728c57 100644 --- a/app/assets/javascripts/discourse/widgets/post.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post.js.es6 @@ -51,6 +51,7 @@ createWidget('select-post', { createWidget('reply-to-tab', { tagName: 'a.reply-to-tab', + buildKey: attrs => `reply-to-tab-${attrs.id}`, defaultState() { return { loading: false }; @@ -61,7 +62,7 @@ createWidget('reply-to-tab', { return [iconNode('mail-forward'), ' ', - avatarImg.call(this,'small',{ + avatarImg('small', { template: attrs.replyToAvatarTemplate, username: attrs.replyToUsername }), diff --git a/app/assets/javascripts/discourse/widgets/raw-html.js.es6 b/app/assets/javascripts/discourse/widgets/raw-html.js.es6 index a1eddd74b1..e009d3caf4 100644 --- a/app/assets/javascripts/discourse/widgets/raw-html.js.es6 +++ b/app/assets/javascripts/discourse/widgets/raw-html.js.es6 @@ -4,9 +4,13 @@ export default class RawHtml { } init() { - return $(this.html)[0]; + const $html = $(this.html); + this.decorate($html); + return $html[0]; } + decorate() { } + update(prev) { if (prev.html === this.html) { return; } return this.init(); diff --git a/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 new file mode 100644 index 0000000000..61e0626f8d --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6 @@ -0,0 +1,60 @@ +import { searchContextDescription } from 'discourse/lib/search'; +import { h } from 'virtual-dom'; +import { createWidget } from 'discourse/widgets/widget'; + +createWidget('search-term', { + tagName: 'input', + buildId: () => 'search-term', + + buildAttributes(attrs) { + return { type: 'text', + value: attrs.value || '', + placeholder: attrs.contextEnabled ? "" : I18n.t('search.title') }; + }, + + keyUp(e) { + if (e.which === 13) { + return this.sendWidgetAction('fullSearch'); + } + + const val = this.attrs.value; + const newVal = $(`#${this.buildId()}`).val(); + + if (newVal !== val) { + this.sendWidgetAction('searchTermChanged', newVal); + } + } +}); + +createWidget('search-context', { + tagName: 'div.search-context', + + html(attrs) { + const service = this.container.lookup('search-service:main'); + const ctx = service.get('searchContext'); + + const result = []; + if (ctx) { + const description = searchContextDescription(Ember.get(ctx, 'type'), + Ember.get(ctx, 'user.username') || Ember.get(ctx, 'category.name')); + result.push(h('label', [ + h('input', { type: 'checkbox', checked: attrs.contextEnabled }), + ' ', + description + ])); + } + + result.push(this.attach('link', { action: 'showSearchHelp', + label: 'show_help', + className: 'show-help' })); + result.push(h('div.clearfix')); + return result; + }, + + click() { + const val = $('.search-context input').is(':checked'); + if (val !== this.attrs.contextEnabled) { + this.sendWidgetAction('searchContextChanged', val); + } + } +}); diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 new file mode 100644 index 0000000000..5d6e03a82c --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 @@ -0,0 +1,100 @@ +import { avatarImg } from 'discourse/widgets/post'; +import { dateNode } from 'discourse/helpers/node'; +import RawHtml from 'discourse/widgets/raw-html'; +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { iconNode } from 'discourse/helpers/fa-icon'; + +class Highlighted extends RawHtml { + constructor(html, term) { + super({ html: `${html}` }); + this.term = term; + } + + decorate($html) { + $html.highlight(this.term.split(/\s+/), { className: 'search-highlight' }); + } +} + +function createSearchResult(type, linkField, fn) { + return createWidget(`search-result-${type}`, { + html(attrs) { + return attrs.results.map(r => { + return h('li', this.attach('link', { + href: r.get(linkField), + contents: () => fn.call(this, r, attrs.term), + className: 'search-link' + })); + }); + } + }); +} + +function postResult(result, link, term) { + const html = [link]; + + if (!this.site.mobileView) { + html.push(h('span.blurb', [ dateNode(result.created_at), + ' - ', + new Highlighted(result.blurb, term) ])); + } + + return html; +} + +createSearchResult('user', 'path', function(u) { + return [ avatarImg('small', { template: u.avatar_template, username: u.username }), ' ', u.username ]; +}); + +createSearchResult('topic', 'url', function(result, term) { + const topic = result.topic; + const link = h('span.topic', [ + this.attach('topic-status', { topic, disableActions: true }), + h('span.topic-title', new Highlighted(topic.get('fancyTitle'), term)), + this.attach('category-link', { category: topic.get('category'), link: false }) + ]); + + return postResult.call(this, result, link, term); +}); + +createSearchResult('post', 'url', function(result, term) { + return postResult.call(this, result, I18n.t('search.post_format', result), term); +}); + +createSearchResult('category', 'url', function (c) { + return this.attach('category-link', { category: c, link: false }); +}); + +createWidget('search-menu-results', { + tagName: 'div.results', + + html(attrs) { + if (attrs.noResults) { + return h('div.no-results', I18n.t('search.no_results')); + } + + const results = attrs.results; + const resultTypes = results.resultTypes || []; + return resultTypes.map(rt => { + const more = []; + + const moreArgs = { + className: 'filter', + contents: () => [I18n.t('show_more'), ' ', iconNode('chevron-down')] + }; + + if (rt.moreUrl) { + more.push(this.attach('link', $.extend(moreArgs, { href: rt.moreUrl }))); + } else if (rt.more) { + more.push(this.attach('link', $.extend(moreArgs, { action: "moreOfType", + actionParam: rt.type, + className: "filter filter-type"}))); + } + + return [ + h('ul', this.attach(rt.componentName, { results: rt.results, term: attrs.term })), + h('div.no-results', more) + ]; + }); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6 new file mode 100644 index 0000000000..c03f1a99e5 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6 @@ -0,0 +1,166 @@ +import { searchForTerm, isValidSearchTerm } from 'discourse/lib/search'; +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import DiscourseURL from 'discourse/lib/url'; + +// Helps with debouncing and cancelling promises +const SearchHelper = { + _activeSearch: null, + _cancelSearch: null, + + // for cancelling debounced search + cancel() { + if (this._activeSearch) { + this._activeSearch.abort(); + } + + this._cancelSearch = true; + Ember.run.later(() => this._cancelSearch = false, 400); + }, + + perform(widget) { + if (this._cancelSearch){ + this._cancelSearch = null; + return; + } + + if (this._activeSearch) { + this._activeSearch.abort(); + this._activeSearch = null; + } + + const { state } = widget; + const { term, typeFilter, contextEnabled } = state; + const searchContext = contextEnabled ? widget.searchContext() : null; + const fullSearchUrl = widget.fullSearchUrl(); + + this._activeSearch = searchForTerm(term, { typeFilter, searchContext, fullSearchUrl }); + this._activeSearch.then(content => { + state.noResults = content.resultTypes.length === 0; + state.results = content; + }).finally(() => { + state.loading = false; + widget.scheduleRerender(); + this._activeSearch = null; + }); + } +}; + +export default createWidget('search-menu', { + tagName: 'div.search-menu', + buildKey: () => 'search-menu', + + defaultState() { + return { loading: false, + results: {}, + noResults: false, + term: null, + typeFilter: null }; + }, + + fullSearchUrl() { + const state = this.state; + const contextEnabled = this.attrs.contextEnabled; + + const ctx = contextEnabled ? this.searchContext() : null; + const type = Ember.get(ctx, 'type'); + + if (contextEnabled && type === 'topic') { + return; + } + + let url = '/search?q=' + encodeURIComponent(state.term); + if (contextEnabled) { + if (ctx.id.toString().toLowerCase() === this.currentUser.username_lower && + type === "private_messages") { + url += ' in:private'; + } else { + url += encodeURIComponent(" " + type + ":" + ctx.id); + } + } + + return Discourse.getURL(url); + }, + + panelContents() { + const { state } = this; + const contextEnabled = this.attrs.contextEnabled; + + const results = [this.attach('search-term', { value: state.term, contextEnabled }), + this.attach('search-context', { contextEnabled })]; + + if (state.loading) { + results.push(h('div.searching', h('div.spinner'))); + } else { + results.push(this.attach('search-menu-results', { term: state.term, + noResults: state.noResults, + results: state.results })); + } + + return results; + }, + + searchService() { + if (!this._searchService) { + this._searchService = this.container.lookup('search-service:main'); + } + return this._searchService; + }, + + searchContext() { + if (!this._searchContext) { + this._searchContext = this.searchService().get('searchContext'); + } + return this._searchContext; + }, + + html() { + return this.attach('menu-panel', { maxWidth: 500, contents: () => this.panelContents() }); + }, + + clickOutside() { + this.sendWidgetAction('toggleSearchMenu'); + }, + + triggerSearch() { + const { state } = this; + + state.noResults = false; + if (isValidSearchTerm(state.term)) { + this.searchService().set('highlightTerm', state.term); + state.loading = true; + Ember.run.debounce(SearchHelper, SearchHelper.perform, this, 400); + } else { + state.results = []; + } + }, + + moreOfType(type) { + this.state.typeFilter = type; + this.triggerSearch(); + }, + + searchContextChanged(enabled) { + this.state.typeFilter = null; + this.sendWidgetAction('searchMenuContextChanged', enabled); + this.state.contextEnabled = enabled; + this.triggerSearch(); + }, + + searchTermChanged(term) { + this.state.typeFilter = null; + this.state.term = term; + this.triggerSearch(); + }, + + fullSearch() { + if (!isValidSearchTerm(this.state.term)) { return; } + + SearchHelper.cancel(); + const url = this.fullSearchUrl(); + if (url) { + this.sendWidgetEvent('linkClicked'); + DiscourseURL.routeTo(url); + } + } +}); diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6 index 53e1fadde9..7c7be61d6e 100644 --- a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6 @@ -125,6 +125,7 @@ createWidget('topic-map-link', { createWidget('topic-map-expanded', { tagName: 'section.topic-map-expanded', + buildKey: attrs => `topic-map-expanded-${attrs.id}`, defaultState() { return { allLinksShown: false }; diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js.es6 b/app/assets/javascripts/discourse/widgets/topic-status.js.es6 new file mode 100644 index 0000000000..335fa5560d --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/topic-status.js.es6 @@ -0,0 +1,39 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { iconNode } from 'discourse/helpers/fa-icon'; +import { h } from 'virtual-dom'; + +function renderIcon(name, key, canAct) { + const iconArgs = key === 'unpinned' ? { 'class': 'unpinned' } : null, + icon = iconNode(name, iconArgs); + + const attributes = { title: Discourse.Utilities.escapeExpression(I18n.t(`topic_statuses.${key}.help`)) }; + return h(`${canAct ? 'a' : 'span'}.topic-status`, attributes, icon); +} + +export default createWidget('topic-status', { + html(attrs) { + const topic = attrs.topic; + const canAct = this.currentUser && !attrs.disableActions; + + const result = []; + const renderIconIf = (conditionProp, name, key) => { + if (!topic.get(conditionProp)) { return; } + result.push(renderIcon(name, key, canAct)); + }; + + renderIconIf('is_warning', 'envelope', 'warning'); + + if (topic.get('closed') && topic.get('archived')) { + renderIcon('lock', 'locked_and_archived'); + } else { + renderIconIf('topic.closed', 'lock', 'locked'); + renderIconIf('topic.archived', 'lock', 'archived'); + } + + renderIconIf('topic.pinned', 'thumb-tack', 'pinned'); + renderIconIf('topic.unpinned', 'thumb-tack', 'unpinned'); + renderIconIf('topic.invisible', 'eye-slash', 'invisible'); + + return result; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6 new file mode 100644 index 0000000000..da2c8504f4 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6 @@ -0,0 +1,93 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; + +createWidget('user-menu-links', { + tagName: 'div.menu-links-header', + + html(attrs) { + const { currentUser, siteSettings } = this; + + const isAnon = currentUser.is_anonymous; + const allowAnon = siteSettings.allow_anonymous_posting && + currentUser.trust_level >= siteSettings.anonymous_posting_min_trust_level || + isAnon; + + const path = attrs.path; + const glyphs = [{ label: 'user.bookmarks', + className: 'user-bookmarks-link', + icon: 'bookmark', + href: `${path}/activity/bookmarks` }]; + + if (siteSettings.enable_private_messages) { + glyphs.push({ label: 'user.private_messages', + className: 'user-pms-link', + icon: 'envelope', + href: `${path}/messages` }); + } + + const profileLink = { + route: 'user', + model: currentUser, + className: 'user-activity-link', + icon: 'user', + rawLabel: currentUser.username + }; + + if (currentUser.is_anonymous) { + profileLink.label = 'user.profile'; + profileLink.rawLabel = null; + } + + const links = [profileLink]; + if (allowAnon) { + if (!isAnon) { + glyphs.push({ action: 'toggleAnonymous', + label: 'switch_to_anon', + className: 'enable-anonymous', + icon: 'user-secret' }); + } else { + links.push({ className: 'disable-anonymous', + action: 'toggleAnonymous', + label: 'switch_from_anon' }); + } + } + + // preferences always goes last + glyphs.push({ label: 'user.preferences', + className: 'user-preferences-link', + icon: 'gear', + href: `${path}/preferences` }); + + return h('ul.menu-links-row', [ + links.map(l => h('li', this.attach('link', l))), + h('li.glyphs', glyphs.map(l => this.attach('link', $.extend(l, { hideLabel: true })))), + ]); + } +}); + +export default createWidget('user-menu', { + tagName: 'div.user-menu', + + panelContents() { + const path = this.currentUser.get('path'); + + return [this.attach('user-menu-links', { path }), + this.attach('user-notifications', { path }), + h('div.logout-link', [ + h('hr'), + h('ul.menu-links', + h('li', this.attach('link', { action: 'logout', + className: 'logout', + icon: 'sign-out', + label: 'user.log_out' }))) + ])]; + }, + + html() { + return this.attach('menu-panel', { contents: () => this.panelContents() }); + }, + + clickOutside() { + this.sendWidgetAction('toggleUserMenu'); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 new file mode 100644 index 0000000000..d10e64b581 --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/user-notifications-large.js.es6 @@ -0,0 +1,25 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { h } from 'virtual-dom'; +import { dateNode } from 'discourse/helpers/node'; + +createWidget('large-notification-item', { + buildClasses(attrs) { + const result = ['item', 'notification']; + if (!attrs.get('read')) { + result.push('unread'); + } + return result; + }, + + html(attrs) { + return [this.attach('notification-item', attrs), + h('span.time', dateNode(attrs.created_at))]; + } +}); + +export default createWidget('user-notifications-large', { + html(attrs) { + const notifications = attrs.notifications; + return notifications.map(n => this.attach('large-notification-item', n)); + } +}); diff --git a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 new file mode 100644 index 0000000000..8d3e710a0d --- /dev/null +++ b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 @@ -0,0 +1,81 @@ +import { createWidget } from 'discourse/widgets/widget'; +import { headerHeight } from 'discourse/components/site-header'; +import { h } from 'virtual-dom'; + +export default createWidget('user-notifications', { + tagName: 'div.notifications', + buildKey: () => 'user-notifications', + + defaultState() { + return { notifications: [], loading: false }; + }, + + notificationsChanged() { + this.refreshNotifications(this.state); + }, + + refreshNotifications(state) { + if (this.loading) { return; } + + // estimate (poorly) the amount of notifications to return + let limit = Math.round(($(window).height() - headerHeight()) / 55); + // we REALLY don't want to be asking for negative counts of notifications + // less than 5 is also not that useful + if (limit < 5) { limit = 5; } + if (limit > 40) { limit = 40; } + + const stale = this.store.findStale('notification', {recent: true, limit }, {cacheKey: 'recent-notifications'}); + + if (stale.hasResults) { + const results = stale.results; + let content = results.get('content'); + + // we have to truncate to limit, otherwise we will render too much + if (content && (content.length > limit)) { + content = content.splice(0, limit); + results.set('content', content); + results.set('totalRows', limit); + } + + state.notifications = results; + } else { + state.loading = true; + } + + stale.refresh().then(notifications => { + this.currentUser.set('unread_notifications', 0); + state.notifications = notifications; + }).catch(() => { + state.notifications = []; + }).finally(() => { + state.loading = false; + this.scheduleRerender(); + }); + }, + + html(attrs, state) { + if (!state.notifications.length) { + this.refreshNotifications(state); + } + + const result = []; + if (state.loading) { + result.push(h('div.spinner-container', h('div.spinner'))); + } else if (state.notifications.length) { + + const notificationItems = state.notifications.map(n => this.attach('notification-item', n)); + const href = `${attrs.path}/notifications`; + + result.push(h('hr')); + result.push(h('ul', [ + notificationItems, + h('li.read.last.heading', + h('a', { attributes: { href } }, [I18n.t('notifications.more'), '...']) + ) + ])); + + } + + return result; + } +}); diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6 index 7bbc3c10ec..09c2deac3f 100644 --- a/app/assets/javascripts/discourse/widgets/widget.js.es6 +++ b/app/assets/javascripts/discourse/widgets/widget.js.es6 @@ -1,4 +1,4 @@ -import { WidgetClickHook, WidgetClickOutsideHook } from 'discourse/widgets/click-hook'; +import { WidgetClickHook, WidgetClickOutsideHook, WidgetKeyUpHook } from 'discourse/widgets/hooks'; import { h } from 'virtual-dom'; import DecoratorHelper from 'discourse/widgets/decorator-helper'; @@ -66,6 +66,11 @@ function drawWidget(builder, attrs, state) { if (this.buildAttributes) { properties.attributes = this.buildAttributes(attrs); } + + if (this.keyUp) { + properties['widget-key-up'] = new WidgetKeyUpHook(this); + } + if (this.clickOutside) { properties['widget-click-outside'] = new WidgetClickOutsideHook(this); } @@ -119,9 +124,17 @@ export default class Widget { this.key = this.buildKey ? this.buildKey(attrs) : null; + // Helps debug widgets + if (Ember.Test) { + if (Object.keys(this.defaultState(attrs)).length > 0 && !this.key) { + Ember.warn(`you need a key when using state ${this.name}`); + } + } + this.site = container.lookup('site:main'); this.siteSettings = container.lookup('site-settings:main'); this.currentUser = container.lookup('current-user:main'); + this.capabilities = container.lookup('capabilities:main'); this.store = container.lookup('store:main'); this.appEvents = container.lookup('app-events:main'); this.keyValueStore = container.lookup('key-value-store:main'); @@ -143,7 +156,7 @@ export default class Widget { } render(prev) { - if (prev && prev.state) { + if (prev && prev.key && prev.key === this.key) { this.state = prev.state; } else { this.state = this.defaultState(this.attrs, this.state); @@ -166,7 +179,7 @@ export default class Widget { const refreshAction = dirtyOpts.onRefresh; if (refreshAction) { - this.sendWidgetAction(refreshAction); + this.sendWidgetAction(refreshAction, dirtyOpts.refreshArg); } } @@ -243,7 +256,7 @@ export default class Widget { if (target) { // TODO: Use ember closure actions - const actions = target._actions || target.actionHooks; + const actions = target._actions || target.actionHooks || {}; const method = actions[actionName]; if (method) { promise = method.call(target, param); @@ -276,6 +289,16 @@ export default class Widget { return result; } + sendWidgetEvent(name) { + const methodName = `${name}Event`; + return this.rerenderResult(() => { + const widget = this._findAncestorWithProperty(methodName); + if (widget) { + return widget[methodName](); + } + }); + } + sendWidgetAction(name, param) { return this.rerenderResult(() => { const widget = this._findAncestorWithProperty(name); diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 0c11c43989..0af76b9aaf 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -63,12 +63,11 @@ //= require ./discourse/components/combo-box //= require ./discourse/components/edit-category-panel //= require ./discourse/views/button -//= require ./discourse/components/search-result //= require ./discourse/components/dropdown-button //= require ./discourse/components/notifications-button //= require ./discourse/components/topic-notifications-button //= require ./discourse/lib/link-mentions -//= require ./discourse/views/header +//= require ./discourse/components/site-header //= require ./discourse/lib/utilities //= require ./discourse/dialects/dialect //= require ./discourse/lib/emoji/emoji diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss index 610832b1c8..24e28ba2ba 100644 --- a/app/assets/stylesheets/common/base/header.scss +++ b/app/assets/stylesheets/common/base/header.scss @@ -131,7 +131,7 @@ right: 65px; } } - .flagged-posts { + .flagged-posts, .queued-posts { background: $danger; } } diff --git a/test/javascripts/acceptance/hamburger-menu-staff-test.js.es6 b/test/javascripts/acceptance/hamburger-menu-staff-test.js.es6 deleted file mode 100644 index d4bdd05f6f..0000000000 --- a/test/javascripts/acceptance/hamburger-menu-staff-test.js.es6 +++ /dev/null @@ -1,13 +0,0 @@ -import { acceptance } from "helpers/qunit-helpers"; - -acceptance("Hamburger Menu - Staff", { loggedIn: true }); - -test("Menu Items", (assert) => { - visit("/"); - click("#toggle-hamburger-menu"); - andThen(() => { - assert.ok(exists(".hamburger-panel .admin-link")); - assert.ok(exists(".hamburger-panel .flagged-posts-link")); - assert.ok(exists(".hamburger-panel .flagged-posts.badge-notification"), "it displays flag notifications"); - }); -}); diff --git a/test/javascripts/acceptance/hamburger-menu-test.js.es6 b/test/javascripts/acceptance/hamburger-menu-test.js.es6 deleted file mode 100644 index 421acf9165..0000000000 --- a/test/javascripts/acceptance/hamburger-menu-test.js.es6 +++ /dev/null @@ -1,21 +0,0 @@ -import { acceptance } from "helpers/qunit-helpers"; - -acceptance("Hamburger Menu"); - -test("Menu Items", (assert) => { - visit("/"); - click("#toggle-hamburger-menu"); - andThen(() => { - assert.ok(!exists(".hamburger-panel .admin-link"), 'does not have admin link'); - assert.ok(!exists(".hamburger-panel .flagged-posts-link"), 'does not have flagged posts link'); - - assert.ok(exists(".hamburger-panel .latest-topics-link"), 'last link to latest'); - assert.ok(exists(".hamburger-panel .badge-link"), 'has link to badges'); - assert.ok(exists(".hamburger-panel .user-directory-link"), 'has user directory link'); - assert.ok(exists(".hamburger-panel .faq-link"), 'has faq link'); - assert.ok(exists(".hamburger-panel .about-link"), 'has about link'); - assert.ok(exists(".hamburger-panel .categories-link"), 'has categories link'); - - assert.ok(exists('.hamburger-panel .category-link'), 'has at least one category'); - }); -}); diff --git a/test/javascripts/acceptance/header-anonymous-test.js.es6 b/test/javascripts/acceptance/header-anonymous-test.js.es6 deleted file mode 100644 index 088cb4a30f..0000000000 --- a/test/javascripts/acceptance/header-anonymous-test.js.es6 +++ /dev/null @@ -1,30 +0,0 @@ -import { acceptance } from "helpers/qunit-helpers"; -acceptance("Header (Anonymous)"); - -test("header", () => { - visit("/"); - andThen(() => { - ok(exists("header"), "is rendered"); - ok(exists(".logo-big"), "it renders the large logo by default"); - not(exists("#notifications-dropdown li"), "no notifications at first"); - not(exists("#user-dropdown:visible"), "initially user dropdown is closed"); - not(exists("#search-dropdown:visible"), "initially search box is closed"); - }); - - // Logo changing - andThen(() => { - controllerFor('header').set("showExtraInfo", true); - }); - - andThen(() => { - ok(exists(".logo-small"), "it shows the small logo when `showExtraInfo` is enabled"); - }); - - // Search - click("#search-button"); - andThen(() => { - ok(exists(".search-menu:visible"), "after clicking a button search box opens"); - not(exists(".search-menu .heading"), "initially, immediately after opening, search box is empty"); - }); - -}); diff --git a/test/javascripts/acceptance/header-test-staff.js.es6 b/test/javascripts/acceptance/header-test-staff.js.es6 deleted file mode 100644 index 9312db0212..0000000000 --- a/test/javascripts/acceptance/header-test-staff.js.es6 +++ /dev/null @@ -1,14 +0,0 @@ -import { acceptance } from "helpers/qunit-helpers"; - -acceptance("Header (Staff)", { loggedIn: true }); - -test("header", () => { - visit("/"); - - // User dropdown - click("#current-user"); - andThen(() => { - ok(exists(".user-menu:visible"), "is lazily rendered after user opens it"); - ok(exists(".user-menu .menu-links-header"), "has showing / hiding user-dropdown links correctly bound"); - }); -}); diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6 index 71208a7464..7b0c8dc9b7 100644 --- a/test/javascripts/acceptance/search-test.js.es6 +++ b/test/javascripts/acceptance/search-test.js.es6 @@ -12,6 +12,7 @@ test("search", (assert) => { }); fillIn('#search-term', 'dev'); + keyEvent('#search-term', 'keyup', 16); andThen(() => { assert.ok(exists('.search-menu .results ul li'), 'it shows results'); }); diff --git a/test/javascripts/components/menu-panel-test.js.es6 b/test/javascripts/components/menu-panel-test.js.es6 deleted file mode 100644 index 6c586eed7c..0000000000 --- a/test/javascripts/components/menu-panel-test.js.es6 +++ /dev/null @@ -1,65 +0,0 @@ -import componentTest from 'helpers/component-test'; -moduleForComponent('menu-panel', {integration: true}); - -componentTest('as a dropdown', { - template: ` -
    click me
    - -
    - - {{#menu-panel visible=panelVisible markActive=".menu-selected" force="drop-down"}} - Some content - {{/menu-panel}} - `, - - setup() { - this.set('panelVisible', false); - }, - - test(assert) { - assert.ok(exists(".menu-panel.hidden"), "hidden by default"); - - this.set('panelVisible', true); - andThen(() => { - assert.ok(!exists(".menu-panel.hidden"), "toggling visible makes it appear"); - }); - - click('#outside-area'); - andThen(() => { - assert.ok(exists(".menu-panel.hidden"), "clicking the body hides the menu"); - assert.equal(this.get('panelVisible'), false, 'it updates the bound variable'); - }); - } -}); - -componentTest('as a slide-in', { - template: ` -
    click me
    -
    - - {{#menu-panel visible=panelVisible markActive=".menu-selected" force="slide-in"}} - Some content - {{/menu-panel}} - `, - - setup() { - this.set('panelVisible', false); - }, - - test(assert) { - assert.ok(exists(".menu-panel.hidden"), "hidden by default"); - - this.set('panelVisible', true); - andThen(() => { - assert.ok(!exists(".menu-panel.hidden"), "toggling visible makes it appear"); - }); - - click('#outside-area'); - andThen(() => { - assert.ok(exists(".menu-panel.hidden"), "clicking the body hides the menu"); - assert.equal(this.get('panelVisible'), false, 'it updates the bound variable'); - this.set('panelVisible', true); - }); - - } -}); diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6 index 48f0bcdbd0..90f4dda169 100644 --- a/test/javascripts/controllers/topic-test.js.es6 +++ b/test/javascripts/controllers/topic-test.js.es6 @@ -1,7 +1,7 @@ import { blank, present } from 'helpers/qunit-helpers'; moduleFor('controller:topic', 'controller:topic', { - needs: ['controller:header', 'controller:modal', 'controller:composer', 'controller:quote-button', + needs: ['controller:modal', 'controller:composer', 'controller:quote-button', 'controller:topic-progress', 'controller:application'] }); diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6 index 995fb47621..7e8fc08eeb 100644 --- a/test/javascripts/helpers/component-test.js.es6 +++ b/test/javascripts/helpers/component-test.js.es6 @@ -1,6 +1,7 @@ import AppEvents from 'discourse/lib/app-events'; import createStore from 'helpers/create-store'; import { autoLoadModules } from 'discourse/initializers/auto-load-modules'; +import TopicTrackingState from 'discourse/models/topic-tracking-state'; export default function(name, opts) { opts = opts || {}; @@ -22,11 +23,19 @@ export default function(name, opts) { autoLoadModules(); - if (opts.setup) { - const store = createStore(); - this.currentUser = Discourse.User.create(); - this.container.register('store:main', store, { instantiate: false }); + const store = createStore(); + if (!opts.anonymous) { + const currentUser = Discourse.User.create({ username: 'eviltrout' }); + this.currentUser = currentUser; this.container.register('current-user:main', this.currentUser, { instantiate: false }); + this.container.register('topic-tracking-state:main', + TopicTrackingState.create({ currentUser }), + { instantiate: false }); + } + + this.container.register('store:main', store, { instantiate: false }); + + if (opts.setup) { opts.setup.call(this, store); } diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6 index c690585661..63288ef7ab 100644 --- a/test/javascripts/helpers/qunit-helpers.js.es6 +++ b/test/javascripts/helpers/qunit-helpers.js.es6 @@ -2,7 +2,7 @@ import sessionFixtures from 'fixtures/session-fixtures'; import siteFixtures from 'fixtures/site-fixtures'; -import HeaderView from 'discourse/views/header'; +import HeaderComponent from 'discourse/components/site-header'; function currentUser() { return Discourse.User.create(sessionFixtures['/session/current.json'].current_user); @@ -41,7 +41,7 @@ function acceptance(name, options) { Discourse.Utilities.avatarImg = () => ""; // For now don't do scrolling stuff in Test Mode - HeaderView.reopen({examineDockHeader: Ember.K}); + HeaderComponent.reopen({examineDockHeader: Ember.K}); var siteJson = siteFixtures['site.json'].site; if (options) { diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js.es6 index 8d549ff499..9b7f9cea23 100644 --- a/test/javascripts/widgets/actions-summary-test.js.es6 +++ b/test/javascripts/widgets/actions-summary-test.js.es6 @@ -7,8 +7,8 @@ widgetTest('listing actions', { setup() { this.set('args', { actionsSummary: [ - {action: 'off_topic', description: 'very off topic'}, - {action: 'spam', description: 'suspicious message'} + {id: 1, action: 'off_topic', description: 'very off topic'}, + {id: 2, action: 'spam', description: 'suspicious message'} ] }); }, diff --git a/test/javascripts/widgets/hamburger-menu-test.js.es6 b/test/javascripts/widgets/hamburger-menu-test.js.es6 new file mode 100644 index 0000000000..a6ed500761 --- /dev/null +++ b/test/javascripts/widgets/hamburger-menu-test.js.es6 @@ -0,0 +1,173 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; + +moduleForWidget('hamburger-menu'); + +widgetTest('prioritize faq', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.siteSettings.faq_url = 'http://example.com/faq'; + this.currentUser.set('read_faq', false); + }, + + test(assert) { + assert.ok(this.$('.faq-priority').length); + assert.ok(!this.$('.faq-link').length); + } +}); + +widgetTest('prioritize faq - user has read', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.siteSettings.faq_url = 'http://example.com/faq'; + this.currentUser.set('read_faq', true); + }, + + test(assert) { + assert.ok(!this.$('.faq-priority').length); + assert.ok(this.$('.faq-link').length); + } +}); + +widgetTest('staff menu - not staff', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.currentUser.set('staff', false); + }, + + test(assert) { + assert.ok(!this.$('.admin-link').length); + } +}); + +widgetTest('staff menu', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.currentUser.setProperties({ staff: true, site_flagged_posts_count: 3 }); + }, + + test(assert) { + assert.ok(this.$('.admin-link').length); + assert.ok(this.$('.flagged-posts-link').length); + assert.equal(this.$('.flagged-posts').text(), '3'); + assert.ok(!this.$('.settings-link').length); + } +}); + +widgetTest('staff menu - admin', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.currentUser.setProperties({ staff: true, admin: true }); + }, + + test(assert) { + assert.ok(this.$('.settings-link').length); + } +}); + + +widgetTest('queued posts', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.currentUser.setProperties({ + staff: true, + show_queued_posts: true, + post_queue_new_count: 5 + }); + }, + + test(assert) { + assert.ok(this.$('.queued-posts-link').length); + assert.equal(this.$('.queued-posts').text(), '5'); + } +}); + +widgetTest('queued posts - disabled', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.currentUser.setProperties({ staff: true, show_queued_posts: false }); + }, + + test(assert) { + assert.ok(!this.$('.queued-posts-link').length); + } +}); + + +widgetTest('logged in links', { + template: '{{mount-widget widget="hamburger-menu"}}', + + test(assert) { + assert.ok(this.$('.new-topics-link').length); + assert.ok(this.$('.unread-topics-link').length); + } +}); + +widgetTest('general links', { + template: '{{mount-widget widget="hamburger-menu"}}', + anonymous: true, + + test(assert) { + assert.ok(this.$('.latest-topics-link').length); + assert.ok(!this.$('.new-topics-link').length); + assert.ok(!this.$('.unread-topics-link').length); + assert.ok(this.$('.top-topics-link').length); + assert.ok(this.$('.badge-link').length); + assert.ok(this.$('.category-link').length > 0); + } +}); + +widgetTest('badges link - disabled', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.siteSettings.enable_badges = false; + }, + + test(assert) { + assert.ok(!this.$('.badge-link').length); + } +}); + +widgetTest('badges link', { + template: '{{mount-widget widget="hamburger-menu"}}', + + test(assert) { + assert.ok(this.$('.badge-link').length); + } +}); + +widgetTest('user directory link', { + template: '{{mount-widget widget="hamburger-menu"}}', + + test(assert) { + assert.ok(this.$('.user-directory-link').length); + } +}); + +widgetTest('user directory link - disabled', { + template: '{{mount-widget widget="hamburger-menu"}}', + + setup() { + this.siteSettings.enable_user_directory = false; + }, + + test(assert) { + assert.ok(!this.$('.user-directory-link').length); + } +}); + +widgetTest('general links', { + template: '{{mount-widget widget="hamburger-menu"}}', + + test(assert) { + assert.ok(this.$('.about-link').length); + assert.ok(this.$('.keyboard-shortcuts-link').length); + } +}); diff --git a/test/javascripts/widgets/header-test.js.es6 b/test/javascripts/widgets/header-test.js.es6 new file mode 100644 index 0000000000..f3a7b8f907 --- /dev/null +++ b/test/javascripts/widgets/header-test.js.es6 @@ -0,0 +1,37 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; + +moduleForWidget('header'); + +widgetTest('rendering basics', { + template: '{{mount-widget widget="header"}}', + test(assert) { + assert.ok(this.$('header.d-header').length); + assert.ok(this.$('#site-logo').length); + } +}); + +widgetTest('sign up / login buttons', { + template: '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}', + anonymous: true, + + setup() { + this.set('args', { canSignUp: true }); + this.on('showCreateAccount', () => this.signupShown = true); + this.on('showLogin', () => this.loginShown = true); + }, + + test(assert) { + assert.ok(this.$('button.sign-up-button').length); + assert.ok(this.$('button.login-button').length); + + click('button.sign-up-button'); + andThen(() => { + assert.ok(this.signupShown); + }); + + click('button.login-button'); + andThen(() => { + assert.ok(this.loginShown); + }); + } +}); diff --git a/test/javascripts/components/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6 similarity index 53% rename from test/javascripts/components/home-logo-test.js.es6 rename to test/javascripts/widgets/home-logo-test.js.es6 index 60eefd94b9..9c4e678058 100644 --- a/test/javascripts/components/home-logo-test.js.es6 +++ b/test/javascripts/widgets/home-logo-test.js.es6 @@ -1,19 +1,19 @@ -import componentTest from 'helpers/component-test'; +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; -moduleForComponent('home-logo', {integration: true}); +moduleForWidget('home-logo'); const bigLogo = '/images/d-logo-sketch.png?test'; const smallLogo = '/images/d-logo-sketch-small.png?test'; const mobileLogo = '/images/d-logo-sketch.png?mobile'; const title = "Cool Forum"; -componentTest('basics', { - template: '{{home-logo minimized=minimized}}', +widgetTest('basics', { + template: '{{mount-widget widget="home-logo" args=args}}', setup() { this.siteSettings.logo_url = bigLogo; this.siteSettings.logo_small_url= smallLogo; this.siteSettings.title = title; - this.set('minimized', false); + this.set('args', { minimized: false }); }, test(assert) { @@ -23,23 +23,32 @@ componentTest('basics', { assert.ok(this.$('img#site-logo.logo-big').length === 1); assert.equal(this.$('#site-logo').attr('src'), bigLogo); assert.equal(this.$('#site-logo').attr('alt'), title); - - this.set('minimized', true); - andThen(() => { - assert.ok(this.$('img.logo-small').length === 1); - assert.equal(this.$('img.logo-small').attr('src'), smallLogo); - assert.equal(this.$('img.logo-small').attr('alt'), title); - }); } }); -componentTest('no logo', { - template: '{{home-logo minimized=minimized}}', +widgetTest('basics - minmized', { + template: '{{mount-widget widget="home-logo" args=args}}', + setup() { + this.siteSettings.logo_url = bigLogo; + this.siteSettings.logo_small_url= smallLogo; + this.siteSettings.title = title; + this.set('args', { minimized: true }); + }, + + test(assert) { + assert.ok(this.$('img.logo-small').length === 1); + assert.equal(this.$('img.logo-small').attr('src'), smallLogo); + assert.equal(this.$('img.logo-small').attr('alt'), title); + } +}); + +widgetTest('no logo', { + template: '{{mount-widget widget="home-logo" args=args}}', setup() { this.siteSettings.logo_url = ''; this.siteSettings.logo_small_url = ''; this.siteSettings.title = title; - this.set('minimized', false); + this.set('args', { minimized: false }); }, test(assert) { @@ -47,16 +56,25 @@ componentTest('no logo', { assert.ok(this.$('h2#site-text-logo.text-logo').length === 1); assert.equal(this.$('#site-text-logo').text(), title); - - this.set('minimized', true); - andThen(() => { - assert.ok(this.$('i.fa-home').length === 1); - }); } }); -componentTest('mobile logo', { - template: "{{home-logo}}", +widgetTest('no logo - minimized', { + template: '{{mount-widget widget="home-logo" args=args}}', + setup() { + this.siteSettings.logo_url = ''; + this.siteSettings.logo_small_url = ''; + this.siteSettings.title = title; + this.set('args', { minimized: true }); + }, + + test(assert) { + assert.ok(this.$('i.fa-home').length === 1); + } +}); + +widgetTest('mobile logo', { + template: '{{mount-widget widget="home-logo" args=args}}', setup() { this.siteSettings.mobile_logo_url = mobileLogo; this.siteSettings.logo_small_url= smallLogo; @@ -69,8 +87,8 @@ componentTest('mobile logo', { } }); -componentTest('mobile without logo', { - template: "{{home-logo}}", +widgetTest('mobile without logo', { + template: '{{mount-widget widget="home-logo" args=args}}', setup() { this.siteSettings.logo_url = bigLogo; this.site.mobileView = true; @@ -81,10 +99,3 @@ componentTest('mobile without logo', { assert.equal(this.$('#site-logo').attr('src'), bigLogo); } }); - -componentTest("changing url", { - template: '{{home-logo targetUrl="https://www.discourse.org"}}', - test(assert) { - assert.equal(this.$('a').attr('href'), 'https://www.discourse.org'); - } -}); diff --git a/test/javascripts/widgets/post-gutter-test.js.es6 b/test/javascripts/widgets/post-gutter-test.js.es6 index 55c4152cb2..2de86d6761 100644 --- a/test/javascripts/widgets/post-gutter-test.js.es6 +++ b/test/javascripts/widgets/post-gutter-test.js.es6 @@ -6,6 +6,7 @@ widgetTest("duplicate links", { template: '{{mount-widget widget="post-gutter" args=args}}', setup() { this.set('args', { + id: 2, links: [ { title: "Evil Trout Link", url: "http://eviltrout.com" }, { title: "Evil Trout Link", url: "http://dupe.eviltrout.com" } @@ -21,6 +22,7 @@ widgetTest("collapsed links", { template: '{{mount-widget widget="post-gutter" args=args}}', setup() { this.set('args', { + id: 1, links: [ { title: "Link 1", url: "http://eviltrout.com?1" }, { title: "Link 2", url: "http://eviltrout.com?2" }, diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js.es6 new file mode 100644 index 0000000000..3c043090eb --- /dev/null +++ b/test/javascripts/widgets/user-menu-test.js.es6 @@ -0,0 +1,106 @@ +import { moduleForWidget, widgetTest } from 'helpers/widget-test'; + +moduleForWidget('user-menu'); + +widgetTest('basics', { + template: '{{mount-widget widget="user-menu"}}', + + test(assert) { + assert.ok(this.$('.user-menu').length); + assert.ok(this.$('.user-activity-link').length); + assert.ok(this.$('.user-bookmarks-link').length); + assert.ok(this.$('.user-preferences-link').length); + assert.ok(this.$('.notifications').length); + } +}); + +widgetTest('log out', { + template: '{{mount-widget widget="user-menu" logout="logout"}}', + + setup() { + this.on('logout', () => this.loggedOut = true); + }, + + test(assert) { + assert.ok(this.$('.logout').length); + + click('.logout'); + andThen(() => { + assert.ok(this.loggedOut); + }); + } +}); + +widgetTest('private messages - disabled', { + template: '{{mount-widget widget="user-menu"}}', + setup() { + this.siteSettings.enable_private_messages = false; + }, + + test(assert) { + assert.ok(!this.$('.user-pms-link').length); + } +}); + +widgetTest('private messages - enabled', { + template: '{{mount-widget widget="user-menu"}}', + setup() { + this.siteSettings.enable_private_messages = true; + }, + + test(assert) { + assert.ok(this.$('.user-pms-link').length); + } +}); + +widgetTest('anonymous', { + template: '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}', + + setup() { + this.currentUser.setProperties({ is_anonymous: false, trust_level: 3 }); + this.siteSettings.allow_anonymous_posting = true; + this.siteSettings.anonymous_posting_min_trust_level = 3; + + this.on('toggleAnonymous', () => this.anonymous = true); + }, + + test(assert) { + assert.ok(this.$('.enable-anonymous').length); + click('.enable-anonymous'); + andThen(() => { + assert.ok(this.anonymous); + }); + } +}); + +widgetTest('anonymous - disabled', { + template: '{{mount-widget widget="user-menu"}}', + + setup() { + this.siteSettings.allow_anonymous_posting = false; + }, + + test(assert) { + assert.ok(!this.$('.enable-anonymous').length); + } +}); + +widgetTest('anonymous - switch back', { + template: '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}', + + setup() { + this.currentUser.setProperties({ is_anonymous: true }); + this.siteSettings.allow_anonymous_posting = true; + + this.on('toggleAnonymous', () => this.anonymous = true); + }, + + test(assert) { + assert.ok(this.$('.disable-anonymous').length); + click('.disable-anonymous'); + andThen(() => { + assert.ok(this.anonymous); + }); + } +}); + diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js.es6 index 5680516f6b..ed52f81bee 100644 --- a/test/javascripts/widgets/widget-test.js.es6 +++ b/test/javascripts/widgets/widget-test.js.es6 @@ -89,6 +89,7 @@ widgetTest('widget state', { setup() { createWidget('state-test', { tagName: 'button.test', + buildKey: () => `button-test`, defaultState() { return { clicks: 0 }; @@ -121,6 +122,7 @@ widgetTest('widget update with promise', { setup() { createWidget('promise-test', { tagName: 'button.test', + buildKey: () => 'promise-test', html(attrs, state) { return state.name || "No name"; From c7ba5a0d9d808b3f82dc236877c9c996dae9c999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 25 Apr 2016 17:50:32 +0200 Subject: [PATCH 029/125] FIX: global pin should also be limited to dates in the future --- .../javascripts/discourse/templates/modal/feature-topic.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs index 97f8a0e346..cbe81d04cb 100644 --- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs +++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs @@ -65,7 +65,7 @@

    {{i18n "topic.feature_topic.pin_globally"}} {{fa-icon "clock-o"}} - {{date-picker value=model.pinnedGloballyUntil}} + {{date-picker-future value=model.pinnedGloballyUntil}} {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}

    From e72f63e311ac2695d7fc45e83d05b63ee2ca4585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 25 Apr 2016 17:50:50 +0200 Subject: [PATCH 030/125] add index on post_id for the incoming_emails table --- db/migrate/20160425141954_fix_incoming_emails_indices.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20160425141954_fix_incoming_emails_indices.rb diff --git a/db/migrate/20160425141954_fix_incoming_emails_indices.rb b/db/migrate/20160425141954_fix_incoming_emails_indices.rb new file mode 100644 index 0000000000..4fa6366343 --- /dev/null +++ b/db/migrate/20160425141954_fix_incoming_emails_indices.rb @@ -0,0 +1,5 @@ +class FixIncomingEmailsIndices < ActiveRecord::Migration + def change + add_index :incoming_emails, :post_id + end +end From dc014ac4aaa842a9bb5a2dafbd1ff7a31f241312 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 25 Apr 2016 12:31:15 -0400 Subject: [PATCH 031/125] FIX: Topic title wasn't updating when navigating between topics --- app/assets/javascripts/discourse/views/topic.js.es6 | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6 index 0148b4347b..77fd4dcfe4 100644 --- a/app/assets/javascripts/discourse/views/topic.js.es6 +++ b/app/assets/javascripts/discourse/views/topic.js.es6 @@ -37,6 +37,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli // prevents scrolled from being called twice. const enteredAt = this.get('controller.enteredAt'); if (enteredAt && (this.get('lastEnteredAt') !== enteredAt)) { + this._lastShowTopic = null; this.scrolled(); this.set('lastEnteredAt', enteredAt); } From 16c44971d90a7917126b532345c771009a8994e9 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 25 Apr 2016 12:50:55 -0400 Subject: [PATCH 032/125] FIX: Close menus when clicking on notifications --- .../discourse/components/mount-widget.js.es6 | 10 +++++++--- .../discourse/components/site-header.js.es6 | 9 +++++++++ .../javascripts/discourse/widgets/header.js.es6 | 14 +++++++++++++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6 index 85d43d37c8..da98973122 100644 --- a/app/assets/javascripts/discourse/components/mount-widget.js.es6 +++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6 @@ -63,12 +63,16 @@ export default Ember.Component.extend({ afterPatch() { }, + eventDispatched(eventName, key, refreshArg) { + const onRefresh = Ember.String.camelize(eventName.replace(/:/, '-')); + keyDirty(key, { onRefresh, refreshArg }); + this.queueRerender(); + }, + dispatch(eventName, key) { this._childEvents.push(eventName); this.appEvents.on(eventName, refreshArg => { - const onRefresh = Ember.String.camelize(eventName.replace(/:/, '-')); - keyDirty(key, { onRefresh, refreshArg }); - this.queueRerender(); + this.eventDispatched(eventName, key, refreshArg); }); }, diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6 index bfd6bb32f5..b5d4b3e8b1 100644 --- a/app/assets/javascripts/discourse/components/site-header.js.es6 +++ b/app/assets/javascripts/discourse/components/site-header.js.es6 @@ -65,6 +65,14 @@ const SiteHeaderComponent = MountWidget.extend({ this.dispatch('notifications:changed', 'user-notifications'); this.dispatch('header:keyboard-trigger', 'header'); + + this.appEvents.on('dom:clean', () => { + // For performance, only trigger a re-render if any menu panels are visible + if (this.$('.menu-panel').length) { + this.eventDispatched('dom:clean', 'header'); + } + }); + this.examineDockHeader(); }, @@ -78,6 +86,7 @@ const SiteHeaderComponent = MountWidget.extend({ this.appEvents.off('header:show-topic'); this.appEvents.off('header:hide-topic'); + this.appEvents.off('dom:clean'); }, buildArgs() { diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index 314acd1ec7..3f74ad212e 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -187,10 +187,14 @@ export default createWidget('header', { } }, - linkClickedEvent() { + closeAll() { this.state.userVisible = false; this.state.hamburgerVisible = false; this.state.searchVisible = false; + }, + + linkClickedEvent() { + this.closeAll(); this.updateHighlight(); }, @@ -255,6 +259,14 @@ export default createWidget('header', { this.state.contextEnabled = value; }, + domClean() { + const { state } = this; + + if (state.searchVisible || state.hamburgerVisible || state.userVisible) { + this.closeAll(); + } + }, + headerKeyboardTrigger(msg) { switch(msg.type) { case 'search': From 8bad3c0eb5a1abef8d3ecc532c87f2704ecb5902 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 25 Apr 2016 13:35:30 -0400 Subject: [PATCH 033/125] FIX: Cmd/Shift clicking links in the header was broken --- app/assets/javascripts/discourse/widgets/link.js.es6 | 1 + .../javascripts/discourse/widgets/notification-item.js.es6 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6 index 49ccb07a56..587964b23d 100644 --- a/app/assets/javascripts/discourse/widgets/link.js.es6 +++ b/app/assets/javascripts/discourse/widgets/link.js.es6 @@ -70,6 +70,7 @@ export default createWidget('link', { }, click(e) { + if (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey) { return; } e.preventDefault(); if (this.attrs.action) { diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 index 108e757b88..a5563d81fe 100644 --- a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 +++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 @@ -96,7 +96,9 @@ createWidget('notification-item', { }, click(e) { + if (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey) { return; } e.preventDefault(); + this.attrs.set('read', true); const id = this.attrs.id; Discourse.setTransientHeader("Discourse-Clear-Notifications", id); From 6978171f4678147e07436566d278352992a0d9a6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 25 Apr 2016 13:47:57 -0400 Subject: [PATCH 034/125] FIX: Missing topic status icons in header --- .../discourse/widgets/topic-status.js.es6 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js.es6 b/app/assets/javascripts/discourse/widgets/topic-status.js.es6 index 335fa5560d..b220641a69 100644 --- a/app/assets/javascripts/discourse/widgets/topic-status.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-status.js.es6 @@ -11,6 +11,8 @@ function renderIcon(name, key, canAct) { } export default createWidget('topic-status', { + tagName: 'div.topic-statuses', + html(attrs) { const topic = attrs.topic; const canAct = this.currentUser && !attrs.disableActions; @@ -26,13 +28,13 @@ export default createWidget('topic-status', { if (topic.get('closed') && topic.get('archived')) { renderIcon('lock', 'locked_and_archived'); } else { - renderIconIf('topic.closed', 'lock', 'locked'); - renderIconIf('topic.archived', 'lock', 'archived'); + renderIconIf('closed', 'lock', 'locked'); + renderIconIf('archived', 'lock', 'archived'); } - renderIconIf('topic.pinned', 'thumb-tack', 'pinned'); - renderIconIf('topic.unpinned', 'thumb-tack', 'unpinned'); - renderIconIf('topic.invisible', 'eye-slash', 'invisible'); + renderIconIf('pinned', 'thumb-tack', 'pinned'); + renderIconIf('unpinned', 'thumb-tack', 'unpinned'); + renderIconIf('invisible', 'eye-slash', 'invisible'); return result; } From e3f42d703838809bca9ed41d89de383383a28a07 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Mon, 25 Apr 2016 23:34:16 +0530 Subject: [PATCH 035/125] Update Translations --- config/locales/client.bs_BA.yml | 6 +- config/locales/client.ja.yml | 270 +++++++++++++++++++------------- config/locales/client.nb_NO.yml | 36 +++++ config/locales/server.ar.yml | 69 +++++++- config/locales/server.vi.yml | 84 ++++++++++ 5 files changed, 351 insertions(+), 114 deletions(-) diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index 08b0fc2eb4..581e973910 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -744,8 +744,8 @@ bs_BA: instagram: title: "sa Instagramom" facebook: - title: "sa Facebukom" - message: "Identifikujemo sa Facebukom (nadamo se da su vam isključeni popup blokeri)" + title: "sa Facebook" + message: "Identifikujemo sa Facebook (nadamo se da su vam isključeni popup blokeri)" yahoo: title: "sa Yahoo" message: "Authenticating with Yahoo (make sure pop up blockers are not enabled)" @@ -1620,6 +1620,7 @@ bs_BA: actions: delete_user: "delete user" change_trust_level: "change trust level" + change_username: "zamjeni korisničko ime" change_site_setting: "change site setting" change_site_customization: "change site customization" delete_site_customization: "delete site customization" @@ -1677,6 +1678,7 @@ bs_BA: pending: 'Users Pending Review' newuser: 'Users at Trust Level 0 (New User)' basic: 'Users at Trust Level 1 (Basic User)' + staff: "Zaposleni" admins: 'Admin Users' moderators: 'Moderators' blocked: 'Blocked Users' diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 0472d90f33..b945392dbb 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -91,6 +91,8 @@ ja: facebook: 'Facebook でこのリンクを共有する' google+: 'Google+ でこのリンクを共有する' email: 'メールでこのリンクを送る' + action_codes: + invited_user: "%{who} から招待されました: %{when}" topic_admin_menu: "トピック管理" emails_are_disabled: "メールアドレスの送信は管理者によって無効化されています。全てのメール通知は行われません" s3: @@ -122,7 +124,7 @@ ja: show_help: "オプション" links: "リンク" links_lowercase: - other: "リンク集" + other: "リンク" faq: "よくある質問" guidelines: "ガイドライン" privacy_policy: "プライバシーポリシー" @@ -371,7 +373,7 @@ ja: bio: "自己紹介" invited_by: "招待した人: " trust_level: "トラストレベル" - notifications: "通知" + notifications: "お知らせ" statistics: "統計" desktop_notifications: label: "デスクトップ通知" @@ -384,11 +386,11 @@ ja: each_browser_note: "注意: 利用するすべてのブラウザでこの設定を変更する必要があります" dismiss_notifications: "全て既読にする" dismiss_notifications_tooltip: "全ての未読の通知を既読にします" - disable_jump_reply: "返信後に投稿へ移動しない" + disable_jump_reply: "返信した後に投稿へ移動しない" dynamic_favicon: "新規または更新されたトピックのカウントをブラウザアイコンに表示する" edit_history_public: "投稿の編集履歴を公開する" external_links_in_new_tab: "外部リンクを全て新しいタブで開く" - enable_quoting: "ハイライトしたテキストを引用して回答する" + enable_quoting: "選択したテキストを引用して返信する" change: "変更" moderator: "{{user}} はモデレータです" admin: "{{user}} は管理者です" @@ -405,9 +407,9 @@ ja: tracked_categories_instructions: "カテゴリの新しいトピックを自動的に追跡します。トピックに対して新しい投稿があった場合、トピック一覧に新しい投稿数がつきます。" muted_categories: "ミュート中" delete_account: "アカウントを削除する" - delete_account_confirm: "本当にアカウントを削除しますか？削除されたアカウントを復元できません。" + delete_account_confirm: "本当にアカウントを削除しますか？削除されたアカウントは復元できません。" deleted_yourself: "あなたのアカウントは削除されました。" - delete_yourself_not_allowed: "アカウントを削除できませんでした。サイト管理者を連絡してください。" + delete_yourself_not_allowed: "アカウントを削除できませんでした。サイトの管理者へ連絡してください。" unread_message_count: "メッセージ" admin_delete: "削除" users: "ユーザ" @@ -438,16 +440,16 @@ ja: action: "パスワードリセット用メールを送信する" set_password: "パスワードを設定する" change_about: - title: "自己紹介の変更" + title: "プロフィールを変更" error: "変更中にエラーが発生しました。" change_username: - title: "ユーザ名の変更" - confirm: "ユーザ名を変更すると、あなたのポストの引用と @ユーザ名でタグ付けされたリンクが解除されます。本当にユーザ名を変更しますか？" + title: "ユーザ名を変更" + confirm: "ユーザ名を変更すると、投稿への引用と @ユーザ名でメンションされた時のリンクが解除されます。本当にユーザ名を変更してもよろしいですか?" taken: "このユーザ名は既に使われています。" error: "ユーザ名変更中にエラーが発生しました。" invalid: "このユーザ名は無効です。英数字のみ利用可能です。" change_email: - title: "メールアドレスの変更" + title: "メールアドレスを変更" taken: "このメールアドレスは既に使われています。" error: "メールアドレス変更中にエラーが発生しました。既にこのアドレスが使われているのかもしれません。" success: "このアドレスにメールを送信しました。メールの指示に従って確認処理を行ってください。" @@ -523,7 +525,7 @@ ja: every_three_days: "3日毎" weekly: "毎週" every_two_weeks: "2週間に1回" - email_direct: "誰かが投稿を引用した時、投稿したポストに返信があった時、私のユーザ名にメンションがあった時、またはトピックへの招待があった時にメールで通知を受け取る。" + email_direct: "誰かが投稿を引用した時、投稿に返信があった時、私のユーザ名にメンションがあった時、またはトピックへの招待があった時にメールで通知を受け取る。" email_private_messages: "メッセージを受け取ったときにメールで通知を受け取る。" email_always: "フォーラムにアクティブに参加している状態でも常にメール通知を受け取る" other_settings: "その他" @@ -531,10 +533,10 @@ ja: new_topic_duration: label: "以下の条件でトピックを新規と見なす" not_viewed: "未読のもの" - last_here: "前回ログアウト後に投稿されたもの" - auto_track_topics: "自動でトピックをトラックする" + last_here: "ログアウトした後に投稿されたもの" + auto_track_topics: "自動でトピックを追跡する" auto_track_options: - never: "トラックしない" + never: "追跡しない" immediately: "今すぐ" after_30_seconds: "30秒後" after_1_minute: "1分後" @@ -544,9 +546,12 @@ ja: after_5_minutes: "5分後" after_10_minutes: "10分後" invited: - search: "招待履歴を検索するためにキーワードを入力してください..." + search: "招待履歴を検索" title: "招待" user: "招待したユーザ" + none: "保留中の招待はありません。" + truncated: + other: "{{count}} 件の招待を表示しています。" redeemed: "受理された招待" redeemed_tab: "受理" redeemed_at: "受理日" @@ -557,16 +562,17 @@ ja: expired: "この招待の有効期限が切れました。" rescind: "削除" rescinded: "取り消された招待" - reinvite: "招待を再送する" - reinvited: "招待を再送しました。" + reinvite: "招待を再送信する" + reinvited: "招待を再度送りました。" time_read: "リード時間" days_visited: "訪問日数" account_age_days: "アカウント有効日数" - create: "友人をこのフォーラムに招待" + create: "招待を送る" + generate_link: "招待リンクをコピー" bulk_invite: none: "あなたはまだ誰も招待していません。" text: "ファイルからまとめて招待をする" - uploading: "アップロード中..." + uploading: "アップロードしています..." success: "ファイルは無事にアップロードされました。完了されましたらメッセージでお知らせをさせていただきます。" error: "ファイルアップロードエラー：'{{filename}}': {{message}}" password: @@ -577,6 +583,19 @@ ja: same_as_email: "パスワードとメールアドレスが一致しています" ok: "パスワード OK。" instructions: "%{count} 文字以上の長さにしてください。" + summary: + title: "情報" + stats: "統計" + time_read: "読んだ時間" + likes_given: + other: "likes をあげた数" + likes_received: + other: "likes をもらった数" + posts_read: + other: "読んだ投稿" + no_replies: "まだ返信はありません。" + no_topics: "まだトピックはありません。" + no_badges: "まだバッジはありません。" associated_accounts: "関連アカウント" ip_address: title: "最近使用したIPアドレス" @@ -602,6 +621,7 @@ ja: server: "サーバーエラー" forbidden: "アクセス拒否" unknown: "エラー" + not_found: "ページが見つかりません" desc: network: "インターネット接続を確認してください。" network_fixed: "ネットワーク接続が回復しました。" @@ -613,14 +633,15 @@ ja: again: "やり直す" fixed: "ページロード" close: "閉じる" - assets_changed_confirm: "Discourseはアップデートされました。ページ更新して最新バージョンを導入しますか？" + assets_changed_confirm: "Discourseがアップデートされました。ページを更新して最新のバージョンにしますか？" logout: "ログアウトしました" refresh: "Refresh" read_only_mode: + enabled: "このサイトは閲覧専用モードになっています。閲覧し続けられますが、返信したりいいねを付けたり等のアクションは現在出来ません。" login_disabled: "読み取り専用モードにされています。ログインできません。" learn_more: "より詳しく..." year: '年' - year_desc: '過去365日間に投稿されたトピック' + year_desc: '過去一年間に投稿されたトピック' month: '月' month_desc: '過去30日間に投稿されたトピック' week: '週' @@ -630,13 +651,17 @@ ja: mute: ミュート unmute: ミュート解除 last_post: 最終投稿時刻 - last_reply_lowercase: 最新の回答 + last_reply_lowercase: 最後の返信 replies_lowercase: - other: 回答 + other: 返信 signup_cta: sign_up: "新しいアカウントを作成" + hide_forever: "いいえ、結構です" + intro: "こんにちは！ :heart_eyes: エンジョイしていますね。 ですが、サインアップしていないようです。" + value_prop: "アカウントを作成した後、いま読んでいるページへ戻ります。また、新しい投稿があった場合はこことメールにてお知らせします。 いいね！を使って好きな投稿をみんなに教えましょう。 :heartbeat:" summary: enabled_description: "トピックのまとめを表示されています。" + description: "{{replyCount}}件の返信があります。" enable: 'このトピックを要訳する' disable: '全ての投稿を表示する' deleted_filter: @@ -646,7 +671,7 @@ ja: disable: "削除された投稿を表示する" private_message_info: title: "メッセージ" - invite: "友人を招待..." + invite: "友だちを招待する..." remove_allowed_user: "このメッセージから{{name}}を本当に取り除きますか？" email: 'メール' username: 'ユーザ名' @@ -667,7 +692,7 @@ ja: complete_email: "%{email}にパスワード再設定メールを送りました。" complete_username_found: "%{username},アカウントにパスワード再設定メールを送りました。" complete_email_found: "%{email}にパスワード再設定メールを送りました。" - complete_username_not_found: " %{username}のアカウントがありません" + complete_username_not_found: " %{username}は見つかりませんでした" complete_email_not_found: "%{email}で登録したアカウントがありません。" login: title: "ログイン" @@ -683,13 +708,14 @@ ja: or: "または" authenticating: "認証中..." awaiting_confirmation: "アカウントはアクティベーション待ち状態です。もう一度アクティベーションメールを送信するには「パスワードを忘れました」リンクをクリックしてください。" - awaiting_approval: "アカウントはまだスタッフメンバーに承認されていません。承認され次第メールにてお知らせいたします。" + awaiting_approval: "アカウントはまだスタッフに承認されていません。承認され次第メールにてお知らせいたします。" requires_invite: "申し訳ありませんが、このフォーラムは招待制です。" not_activated: "まだログインできません。{{sentTo}} にアクティベーションメールを送信しております。メールの指示に従ってアカウントのアクティベーションを行ってください。" not_allowed_from_ip_address: "このIPアドレスでログインできません" admin_not_allowed_from_ip_address: "そのIPアドレスからは管理者としてログインできません" resend_activation_email: "再度アクティベーションメールを送信するにはここをクリックしてください。" - sent_activation_email_again: "{{currentEmail}} にアクティベーションメールを再送しました。メール到着まで数分かかることがあります (いつまで立ってもメールが届かない場合は、念のためスパムフォルダの中も確認してみてください)。" + sent_activation_email_again: "{{currentEmail}} にアクティベーションメールを再送信しました。メールが届くまで数分掛かることがあります。 (メールが届かない場合は、迷惑メールフォルダの中をご確認ください)。" + preferences: "ユーザ設定を変更するには、ログインする必要があります。" google: title: "Googleで" message: "Google による認証 (ポップアップがブロックされていないことを確認してください)" @@ -699,6 +725,8 @@ ja: twitter: title: "Twitterで" message: "Twitter による認証 (ポップアップがブロックされていないことを確認してください)" + instagram: + message: "Instagram による認証 (ポップアップがブロックされていないことを確認してください)" facebook: title: "Facebookで" message: "Facebook による認証 (ポップアップがブロックされていないことを確認してください)" @@ -713,9 +741,10 @@ ja: twitter: "Twitter" emoji_one: "Emoji One" composer: + more_emoji: "もっと..." options: "オプション" add_warning: "これは公式の警告です。" - posting_not_on_topic: "回答したいトピックはどれですか?" + posting_not_on_topic: "返信したいトピックはどれですか?" saving_draft_tip: "保存中..." saved_draft_tip: "保存しました" saved_local_draft_tip: "ローカルに保存しました" @@ -730,9 +759,9 @@ ja: try_like: ' ボタンを試しましたか？' category_missing: "カテゴリを選択してください。" save_edit: "編集内容を保存" - reply_original: "元のトピックに回答" - reply_here: "ここに回答" - reply: "回答" + reply_original: "オリジナルトピックへ返信" + reply_here: "ここに返信" + reply: "返信" cancel: "キャンセル" create_topic: "トピック作成" create_pm: "メッセージ" @@ -783,9 +812,9 @@ ja: units: "(# of hours)" examples: '時間(24)を入力してください' notifications: - title: "@ユーザ名のタグ付けやあなたが投稿した記事やトピックやメッセージなどに対する回答に関する通知" + title: "@ユーザ名 のメンション、投稿やトピックへの返信、メッセージなどの通知" none: "通知はありません" - more: "古い通知を確認する" + more: "通知をすべて確認する" total_flagged: "フラグが立った投稿の合計" mentioned: "

    {{username}} {{description}}

    " quoted: "

    {{username}} {{description}}

    " @@ -804,12 +833,15 @@ ja: posted: "投稿者 " edited: "投稿の編集者: " liked: "あなたの投稿をいいねしました" + invited_to_private_message: "プライベートメッセージへ招待されました: " + invited_to_topic: "トピックに招待されました: " + invitee_accepted: "招待が承認されました: " moved_post: "投稿を移動しました: " linked: "あなたの投稿にリンク" popup: mentioned: '"{{topic}}"で{{username}} がタグ付けしました - {{site_title}}' quoted: '"{{topic}}"で{{username}}が引用しました - {{site_title}}' - replied: '"{{topic}}"で{{username}}が回答しました - {{site_title}}' + replied: '{{username}}が"{{topic}}"へ返信しました - {{site_title}}' posted: '{{username}} が投稿しました "{{topic}}" - {{site_title}}' private_message: '"{{topic}}"で{{username}}からプライベートメッセージが届きました - {{site_title}}' linked: '"{{topic}}"にあるあなたの投稿に{{username}}がリンクしました - {{site_title}}' @@ -820,6 +852,7 @@ ja: from_the_web: "Web から" remote_tip: "画像へのリンク" local_tip: "ローカルからアップロードする画像を選択" + local_tip_with_attachments: "デバイスから画像/ファイルを選択する {{authorized_extensions}}" hint: "(アップロードする画像をエディタにドラッグ&ドロップすることもできます)" uploading: "アップロード中" select_file: "ファイル選択" @@ -829,7 +862,7 @@ ja: select_all: "全てを選択する" title: "トピック、投稿、ユーザ、カテゴリを探す" no_results: "何も見つかりませんでした。" - no_more_results: "これ以上結果が見つかりませんでした。" + no_more_results: "何も見つかりませんでした。" search_help: 検索ヘルプ searching: "検索中..." post_format: "#{{post_number}} {{username}}から" @@ -838,6 +871,7 @@ ja: category: "\"{{category}}\" カテゴリで検索する" topic: "このトピックを探す" private_messages: "メッセージ検索" + hamburger_menu: "他のトピック一覧 or カテゴリ へ行く" go_back: '戻る' not_logged_in_user: 'ユーザアクティビティと設定ページ' current_user: 'ユーザページに移動' @@ -848,16 +882,16 @@ ja: dismiss_new: "既読に設定" toggle: "選択したトピックを切り替え" actions: "操作" - change_category: "カテゴリ変更" + change_category: "カテゴリを変更" close_topics: "トピックをクローズする" archive_topics: "アーカイブトピック" - notification_level: "通知レベル変更" - choose_new_category: "このトピックへの新しいカテゴリを選択してください" + notification_level: "通知レベルを変更" + choose_new_category: "このトピックの新しいカテゴリを選択してください" selected: other: "あなたは {{count}} トピックを選択しました。" none: - unread: "未読トピックはありません。" - new: "新着トピックはありません。" + unread: "未読のトピックはありません。" + new: "新しいトピックはありません。" read: "まだトピックを一つも読んでいません。" posted: "トピックは一つもありません。" latest: "最新のトピックはありません。" @@ -867,18 +901,18 @@ ja: top: "トップトピックはありません。" search: "検索結果はありません。" educate: - unread: '

    Y新しいトピックがここに表示されます。

    未読のトピックがある場合は、1と表示されます。 もし、

    • トピックを作る
    • トピックに返信
    • 4分以上のトピックを読む場合

    などを設定した場合、トピックを追跡してそれぞれのトピックの下にある通知の設定を経由してウォッチします。

    プロフィール から変更できます。

    ' + unread: '

    新しいトピックがここに表示されます。

    未読のトピックがある場合は、1と表示されます。 もし、

    • トピックを作る
    • トピックに返信
    • 4分以上のトピックを読む場合

    などを設定した場合、トピックを追跡してそれぞれのトピックの下にある通知の設定を経由してウォッチします。

    プロフィール から変更できます。

    ' bottom: - latest: "最新のトピックはこれ以上ありません。" - hot: "ホットなトピックはこれ以上ありません。" - posted: "ポストのあるトピックはこれ以上ありません。" - read: "既読のトピックはこれ以上ありません。" - new: "新規トピックはこれ以上ありません。" - unread: "未読のトピックはこれ以上ありません。" - category: "{{category}} トピックはこれ以上ありません。" + latest: "最新のトピックは以上です。" + hot: "ホットなトピックは以上です。" + posted: "投稿のあるトピックは以上です。" + read: "既読のトピックは以上です。" + new: "新規トピックは以上です。" + unread: "未読のトピックは以上です。" + category: "{{category}}トピックは以上です。" top: "トップトピックはこれ以上ありません。" bookmarks: "ブックマーク済みのトピックはこれ以上ありません。" - search: "検索結果はこれ以上ありません。" + search: "検索結果は以上です。" topic: filter_to: "トピック内の{{post_count}}個のポストを表示" create: '新規トピック' @@ -914,14 +948,14 @@ ja: options: "トピックオプション" show_links: "このトピック内のリンクを表示" toggle_information: "トピック詳細をトグル" - read_more_in_category: "{{catLink}} の他のトピックを見る or {{latestLink}}。" + read_more_in_category: "{{catLink}}の他のトピックを見る or {{latestLink}}。" read_more: "{{catLink}} or {{latestLink}}。" read_more_MF: "{ UNREAD, plural, =0 {} one { 未読 1つ } other { 未読 #つ } } { NEW, plural, =0 {} one { {BOTH, select, true{} false {} other{}} 新規トピック 1つ} other { {BOTH, select, true{} false {} other{}} 新規トピック #つ} } remaining, or {CATEGORY, select, true {{catLink}の他のトピックを読む} false {{latestLink}} other {}}" browse_all_categories: 全てのカテゴリを閲覧する view_latest_topics: 最新のトピックを見る suggest_create_topic: 新しいトピックを作成しますか？ - jump_reply_up: 以前の回答へジャンプ - jump_reply_down: 以後の回答へジャンプ + jump_reply_up: 以前の返信へジャンプ + jump_reply_down: 以後の返信へジャンプ deleted: "トピックは削除されました" auto_close_notice: "このトピックはあと%{timeLeft}で自動的にクローズします。" auto_close_notice_based_on_last_post: "このトピックは最後の返信から%{duration} 経つとクローズします" @@ -943,14 +977,14 @@ ja: '3_6': 'このカテゴリに参加中のため通知されます' '3_5': 'このトピックに参加中のため通知されます' '3_2': 'このトピックに参加中のため通知されます。' - '3_1': 'このトピックを作成したため通知されます。' + '3_1': 'このトピックの作成者なため、通知されます。' '3': 'このトピックに参加中のため通知されます。' - '2_8': 'このカテゴリをトラック中のため通知されます。' + '2_8': 'このカテゴリを追跡しているため通知されます。' '2_4': 'このトピックに返信したため通知されます。' - '2_2': 'このトピックをトラック中のため通知されます。' + '2_2': 'このトピックを追跡中のため通知されます。' '2': 'このトピックを閲覧したため通知されます。' - '1_2': '他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます' - '1': '他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます' + '1_2': '他のユーザからメンションされた場合、投稿へ返信された場合に通知します。' + '1': '他のユーザからメンションされた場合、投稿へ返信された場合に通知します。' '0_7': 'このカテゴリに関して一切通知を受け取りません。' '0_2': 'このトピックに関して一切通知を受け取りません。' '0': 'このトピックに関して一切通知を受け取りません。' @@ -961,46 +995,49 @@ ja: title: "参加中" description: "未読件数と新しい投稿がトピックの横に表示されます。このトピックに対して新しい投稿があった場合に通知されます。" tracking_pm: - title: "トラック中" - description: "新規回答件数がこのメッセージに表示されます。他ユーザから@ユーザ名でタグ付けされた場合、またはあなたの投稿に回答がついた場合に通知されます。" + title: "追跡中" + description: "新しい返信の数がこのメッセージに表示されます。他のユーザから@ユーザ名でメンションされた場合や、投稿へ返信された場合に通知されます。" tracking: - title: "トラック中" - description: "新規回答件数がこのトピックに表示されます。他ユーザから@ユーザ名でタグ付けされた場合、またはあなたの投稿に回答がついた場合に通知されます。" + title: "追跡中" + description: "新しい返信の数がこのトピックに表示されます。他のユーザから@ユーザ名でメンションされた場合や、投稿へ返信された場合に通知されます。" regular: - description: "他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます。" + title: "ノーマル" + description: "他のユーザからメンションされた場合か、投稿に返信された場合に通知されます。" regular_pm: - description: "他ユーザからタグ付けをされた場合、またはあなたのメッセージ内の投稿に回答が付いた場合に通知されます。" + title: "ノーマル" + description: "他のユーザからメンションされた場合か、メッセージ内の投稿に返信された場合に通知されます。" muted_pm: title: "ミュートされました" description: "このメッセージについての通知を受け取りません。" muted: title: "ミュート" + description: "このトピックに関するお知らせをすべて受け取りません。また、未読のタブにも通知されません。" actions: - recover: "トピック削除の取り消し" - delete: "トピック削除" + recover: "トピックの削除を取り消す" + delete: "トピックを削除" open: "トピックを開く" close: "トピックをクローズする" multi_select: "投稿を選択" auto_close: "自動でクローズする..." - pin: "トピックをピンで留める。。。" - unpin: "トピックのピンを取り除く。。。" + pin: "トピックを固定" + unpin: "トピックの固定を解除" unarchive: "トピックのアーカイブ解除" archive: "トピックのアーカイブ" invisible: "リストされないようにする" visible: "リストする" reset_read: "読み込みデータをリセット" feature: - pin: "トピックをピンで留める。。。" - unpin: "トピックをピンで留める。。。" + pin: "トピックをピン留めする..." + unpin: "トピックの固定を解除" pin_globally: "トピックを全サイト的にピン留めする" make_banner: "バナートピック" remove_banner: "バナートピックを削除" reply: - title: '回答' - help: 'このトピックに回答する' + title: '返信' + help: 'このトピックに返信する' clear_pin: title: "ピンを解除する" - help: "このトピックのピンを解除し、トピックリストの先頭に表示されないようにする" + help: "このトピックのピンを外し、トピックリストの先頭に表示されないようにする" share: title: 'シェア' help: 'このトピックへのリンクをシェアする' @@ -1015,11 +1052,13 @@ ja: unpin: "{{categoryLink}} カテゴリのトップからトピックを削除" unpin_until: "{{categoryLink}} カテゴリのトップからこのトピックを削除するか、%{until} まで待つ。" pin_note: "ユーザはトピックを個別にピン留め解除することができます" + not_pinned: "{{categoryLink}}でピン留めされているトピックはありません。" pin_globally: "このトピックをすべてのトピックリストのトップに表示する" confirm_pin_globally: "既に{{count}} 個ピン留めしています。　多すぎるピン留めは新規ユーザと匿名ユーザの負担になる場合があります。ピン留めを続けますか？" unpin_globally: "トピック一覧のトップからこのトピックを削除します" unpin_globally_until: "このトピックをすべてのトピックリストのトップから削除するか、%{until} まで待つ。" global_pin_note: "ユーザはトピックを個別にピン留め解除することができます" + not_pinned_globally: "ピン留めされたトピックはありません。" make_banner: "このトピックを全てのページのバナーに表示します" remove_banner: "全てのページのバナーを削除します" banner_note: "ユーザはバナーを閉じることができます。常に１つのトピックだけがバナー表示されます" @@ -1027,7 +1066,7 @@ ja: automatically_add_to_groups_optional: "この招待によって、リストされたグループに参加することができます。" automatically_add_to_groups_required: "この招待によって、リストされたグループに参加することができます。" invite_private: - title: 'メッセージへの参加を招待する' + title: 'プライベートメッセージへ招待する' email_or_username: "招待するユーザのメールアドレスまたはユーザ名" email_or_username_placeholder: "メールアドレスまたはユーザ名" action: "招待" @@ -1035,19 +1074,19 @@ ja: error: "申し訳ありませんが、ユーザ招待中にエラーが発生しました。" group_name: "グループ名" invite_reply: - title: '友人を招待して回答してもらう' + title: '招待' username_placeholder: "ユーザ名" - action: '招待状を送る' + action: '招待を送る' help: 'このトピックに他のユーザをメールまたは通知で招待する。' to_forum: "ログインしなくてもこの投稿に返信ができることを、あなたの友人に知らせます。" sso_enabled: "このトピックに招待したい人のユーザ名を入れてください" to_topic_blank: "このトピックに招待したい人のユーザ名かメールアドレスを入れてください" - to_topic_email: "あなたはメールアドレスを入力しました。あなたの友人がすぐにこのトピックに返信をできるように招待状をメールで送信します。" + to_topic_email: "あなたはメールアドレスを入力しました。フレンドがすぐにこのトピックへ返信できるようにメールで招待します。" to_topic_username: "ユーザ名を入力しました。このトピックへの招待リンクの通知を送信します。" to_username: "招待したい人のユーザ名を入れてください。このトピックへの招待リンクの通知を送信します。" email_placeholder: 'name@example.com' success_email: "{{emailOrUsername}}に招待を送信しました。招待が受理されたらお知らせします。招待した人はユーザページの招待タブにて確認できます。" - success_username: "ユーザにこのトピックへの参加を招待しました。" + success_username: "ユーザをこのトピックへ招待しました。" error: "申し訳ありません。その人を招待できませんでした。すでに招待を送信していませんか？ (招待できる数には限りがあります)" login_reply: 'ログインして返信' filters: @@ -1069,17 +1108,20 @@ ja: other: "{{count}}個の投稿をどのトピックに移動するか選択してください。" change_owner: title: "投稿者を変更する" - action: "所有権を変更" + action: "オーナーシップを変更" error: "オーナーの変更ができませんでした。" label: "投稿の新しいオーナー" placeholder: "新しい所有者のユーザ名" instructions: other: "この {{count}} つの投稿の新しいオーナーを選択してください。（前のオーナー：{{old_user}}）" instructions_warn: "この投稿についての通知が新しいユーザにさかのぼって移動されることはないので注意してください。
    警告: 投稿の関連データの所有権は、新しいユーザに転送されません。 注意して使用してください。" + change_timestamp: + title: "タイムスタンプを変更" + action: "タイムスタンプを変更" multi_select: select: '選択' selected: '選択中 ({{count}})' - select_replies: '全ての回答と共に選択' + select_replies: '返信と選択' delete: 選択中のものを削除 cancel: 選択を外す select_all: 全てを選択する @@ -1089,12 +1131,12 @@ ja: post: reply: " {{replyAvatar}} {{usernameLink}}" reply_topic: " {{link}}" - quote_reply: "引用して回答" + quote_reply: "引用して返信" edit: "編集中 {{link}} {{replyAvatar}} {{username}}" edit_reason: "理由: " post_number: "投稿{{number}}" last_edited_on: "投稿の最終編集日" - reply_as_new_topic: "リンクトピックとして引用返信" + reply_as_new_topic: "リンクされたトピックとして返信" continue_discussion: "{{postLink}} からのディスカッションを継続:" follow_quote: "引用した投稿に移動" show_full: "全て表示" @@ -1103,11 +1145,11 @@ ja: other: "(投稿は投稿者により削除されました。フラグがついていない場合、%{count}時間後に自動的に削除されます)" expand_collapse: "展開/折りたたみ" gap: - other: "{{count}}個の隠された回答を表示する" - more_links: "{{count}} つリンク..." + other: "{{count}}個の返信をすべて表示する" + more_links: "{{count}} つのリンク..." unread: "未読の投稿" has_replies: - other: "{{count}} つの回答" + other: "{{count}} 件の返信" has_likes: other: "{{count}} 個のいいね！" has_likes_title: @@ -1147,15 +1189,16 @@ ja: delete_replies: confirm: other: "この投稿への{{count}}件の返信を削除しますか?" - yes_value: "はい、回答も一緒に削除する" + yes_value: "返信も一緒に削除します" no_value: "投稿のみを削除する" admin: "投稿の管理" wiki: "wiki投稿にする" unwiki: "wiki投稿から外す" - convert_to_moderator: "スタッフ色を追加" - revert_to_regular: "スタッフ色を削除" + convert_to_moderator: "スタッフカラーを追加" + revert_to_regular: "スタッフカラーを外す" rebake: "HTMLを再構築" unhide: "表示する" + change_owner: "オーナーシップを変更" actions: flag: 'フラグ' defer_flags: @@ -1252,7 +1295,8 @@ ja: settings: '設定' topic_template: "トピックテンプレート" delete: 'カテゴリを削除する' - create: '新しいカテゴリ' + create: '新規カテゴリ' + create_long: '新しいカテゴリを作る' save: 'カテゴリを保存する' slug: 'カテゴリスラグ' slug_placeholder: '(任意)URL用' @@ -1295,9 +1339,10 @@ ja: watching: title: "カテゴリ参加中" tracking: - title: "トラック中" + title: "追跡中" regular: - description: "他ユーザからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます。" + title: "ノーマル" + description: "他のユーザからメンションされた場合や、投稿に返信された場合に通知されます。" muted: title: "ミュート中" flagging: @@ -1305,9 +1350,9 @@ ja: action: 'フラグをつける' take_action: "アクションをする" notify_action: 'メッセージ' - delete_spammer: "スパマーの削除" + delete_spammer: "スパムの削除" delete_confirm: "このユーザのアカウントと、%{posts}個の投稿、%{topics}個のトピックを削除し、メールアドレス %{email} をブロックリストに追加しようとしています。本当にこのユーザをスパムユーザーとして認識してもよろしいですか?" - yes_delete_spammer: "はい、スパマーを削除する" + yes_delete_spammer: "はい、スパムを削除する" ip_address_missing: "(N/A)" hidden_email_address: "(hidden)" submit_tooltip: "プライベートフラグを通知する" @@ -1328,7 +1373,7 @@ ja: action: "トピックにフラグを立てる" notify_action: "メッセージ" topic_map: - title: "トピックのサマリー" + title: "トピックの情報" participants_title: "よく投稿する人" links_title: "人気のリンク" links_shown: "全{{totalLinks}}リンクを表示..." @@ -1368,7 +1413,7 @@ ja: views: "閲覧" views_lowercase: other: " 閲覧" - replies: "回答" + replies: "返信" views_long: "このトピックは{{number}}回閲覧されました" activity: "アクティビティ" likes: "いいね！" @@ -1447,18 +1492,18 @@ ja: title: "毎日" all_time: "今まで" this_year: "年" - this_quarter: "季刊" + this_quarter: "今季" this_month: "月" this_week: "週" today: "本日" other_periods: "次の期間のトピックを見る" browser_update: 'ここで動作するにはブラウザのバージョンが古すぎます。 。 ここでブラウザアップグレード.' permission_types: - full: "作成できる / 回答できる / 閲覧できる" - create_post: "回答できる / 閲覧できる" + full: "作成 / 返信 / 閲覧" + create_post: "返信 / 閲覧" readonly: "閲覧できる" admin_js: - type_to_filter: "設定項目の絞り込み..." + type_to_filter: "設定項目を検索..." admin: title: 'Discourse 管理者' moderator: 'モデレータ' @@ -1644,7 +1689,7 @@ ja: confirm: "本当に実行中バックアップ作業をキャンセルしますか？" backup: label: "バックアップ" - title: "バックアップを作成します" + title: "バックアップを作成" confirm: "新しいバックアップを行ってもよろしいですか？" without_uploads: "はい(ファイルは含まない)" download: @@ -1715,15 +1760,15 @@ ja: long_title: "CSS と HTML のカスタマイズ" colors: title: "色" - long_title: "色スキーマ" + long_title: "カラースキーム" about: "CSSを記述することなくサイトのカラーを変更できます。スキームを追加して始めてください" - new_name: "新しい色スキーム" + new_name: "カラースキームを作成" copy_name_prefix: "のコピー" - delete_confirm: "このカラースキームを削除しますか？" + delete_confirm: "このカラースキームを削除してもよろしいですか？" undo: "取り消す" undo_title: "変更を元に戻して、前回保存されたカラーにします" revert: "取り戻す" - revert_title: "既定の配色に戻る" + revert_title: "デフォルトのカラースキームへ戻す" primary: name: 'プライマリー' description: 'テキスト、アイコンと枠の色' @@ -1732,7 +1777,7 @@ ja: description: 'メイン背景とボタンのテキスト色' tertiary: name: 'ターシャリ' - description: 'リンク、いくつかのボタン、通知、アクセントカラー' + description: 'リンク、いくつかのボタン、お知らせ、アクセントカラー' quaternary: name: "クォータナリ" description: "ナビゲーションリンク" @@ -1762,6 +1807,7 @@ ja: test_error: "テストメールを送れませんでした。メール設定、またはホストをメールコネクションをブロックされていないようを確認してください。" sent: "送信済み" skipped: "スキップ済み" + received: "もらった" sent_at: "送信時間" time: "日付" user: "ユーザ" @@ -1776,7 +1822,7 @@ ja: html: "html" text: "text" last_seen_user: "ユーザが最後にサイトを訪れた日:" - reply_key: "回答キー" + reply_key: "返信キー" skipped_reason: "スキップの理由" incoming_emails: error: "エラー" @@ -1789,7 +1835,7 @@ ja: user_placeholder: "ユーザ名" address_placeholder: "name@example.com" type_placeholder: "ダイジェスト、サインアップ..." - reply_key_placeholder: "回答キー" + reply_key_placeholder: "返信キー" skipped_reason_placeholder: "理由" logs: title: "ログ" @@ -1842,6 +1888,7 @@ ja: anonymize_user: "匿名ユーザ" roll_up: "IPブロックをロールアップ" delete_category: "カテゴリを削除する" + create_category: "カテゴリを作る" block_user: "ユーザをブロック" unblock_user: "ユーザをブロック解除" grant_admin: "管理者権限を付与" @@ -1965,11 +2012,11 @@ ja: last_100_days: '過去100日に' private_topics_count: プライベートトピック数 posts_read_count: 読んだ投稿数 - post_count: 投稿した投稿数 + post_count: 投稿数 topics_entered: 閲覧したトピック数 flags_given_count: 設定したフラグ数 flags_received_count: 設定されたフラグ数 - warnings_received_count: 警告をもらった + warnings_received_count: 警告されました flags_given_received_count: 'フラグを与えた/もらった' approve: '承認' approved_by: "承認したユーザ" @@ -2003,6 +2050,7 @@ ja: deactivate_failed: "ユーザのアクティベート解除に失敗しました。" unblock_failed: 'ユーザのブロック解除に失敗しました。' block_failed: 'ユーザのブロックに失敗しました。' + block_confirm: 'このユーザをブロックしてもよろしいですか? ユーザは新しくトピックを作成したり、投稿する事ができなくなります。' deactivate_explanation: "アクティベート解除されたユーザは、メールで再アクティベートする必要があります。" suspended_explanation: "サスペンド中のユーザはログインできません。" block_explanation: "ブロックされているユーザは投稿およびトピックの作成ができません。" @@ -2021,7 +2069,7 @@ ja: requirement_heading: "条件" visits: "訪問" days: "日" - topics_replied_to: "回答したトピック" + topics_replied_to: "返信したトピック" topics_viewed: "閲覧したトピック数" topics_viewed_all_time: "閲覧したトピック" posts_read: "閲覧した投稿数" @@ -2235,7 +2283,7 @@ ja: pin_unpin_topic: 'shift+pトピックを ピン留め/ピン留め解除' share_topic: 'shift+s トピックをシェア' share_post: 's 投稿をシェアする' - reply_as_new_topic: 't リンクトピックとして引用返信' + reply_as_new_topic: 't トピックへリンクして返信' reply_topic: 'shift+r トピックに返信' reply_post: 'r 投稿に返信' quote_post: 'q 投稿を引用する' @@ -2246,7 +2294,7 @@ ja: delete: 'd 投稿を削除する' mark_muted: 'm, m トピックをミュートする' mark_regular: 'm, r 通常トピックにする' - mark_tracking: 'm, t トピックをトラックする' + mark_tracking: 'm, t トピックを追跡する' mark_watching: 'm, w トピックを参加中にする' badges: title: バッジ diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 30a764705f..36e38590e1 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -100,6 +100,8 @@ nb_NO: x_years: one: "1 år senere" other: "%{count} år senere" + previous_month: 'Forrige Måned' + next_month: 'Neste Måned' share: topic: 'del en lenke til dette emnet' post: 'innlegg #%{postNumber}' @@ -157,6 +159,8 @@ nb_NO: more: "Mer" less: "Mindre" never: "aldri" + every_30_minutes: "hvert 30 minutt" + every_hour: "hver time" daily: "daglig" weekly: "ukentlig" every_two_weeks: "annenhver uke" @@ -168,6 +172,7 @@ nb_NO: other: "{{count}} tegn" suggested_topics: title: "Anbefalte emner" + pm_title: "Foreslåtte Meldinger" about: simple_title: "Om" title: "Om %{title}" @@ -223,6 +228,7 @@ nb_NO: revert: "Reverser" failed: "Mislykket" switch_to_anon: "Anonym modus" + switch_from_anon: "Avslutt Anonym" banner: close: "Fjern denne banneren" edit: "Endre denne banneren >>" @@ -299,7 +305,9 @@ nb_NO: one: "gruppe" other: "grupper" members: "Medlemmer" + topics: "Emner" posts: "Innlegg" + messages: "Meldinger" alias_levels: nobody: "Ingen" only_admins: "Kun administratorer" @@ -315,6 +323,7 @@ nb_NO: title: "Sporer" regular: title: "Normal" + description: "Du vil bli varslet hvis noen nevner ditt @navn eller svarer deg." user_action_groups: '1': "Liker tildelt" '2': "Liker mottatt" @@ -382,6 +391,7 @@ nb_NO: notifications: "Varsler" statistics: "Statistikk" desktop_notifications: + label: "Skrivebordsvarslinger" perm_default: "Slå på varslinger" perm_denied_btn: "Tillatelse avslått" disable: "Slå av varslinger" @@ -507,8 +517,17 @@ nb_NO: title: "Brukerkort merke" website: "Nettsted" email_settings: "E-post" + like_notification_frequency: + always: "Alltid" + first_time_and_daily: "Første gnag et innlegg blir likt og daglig" + first_time: "Første gang et innlegg blir likt" + never: "Aldri" + email_previous_replies: + always: "alltid" + never: "aldri" email_digests: title: "Send meg sammendrag av hva som er nytt på e-post når jeg ikke er ofte innom:" + every_hour: "hver time" daily: "daglig" every_three_days: "hver tredje dag" weekly: "ukentlig" @@ -526,6 +545,12 @@ nb_NO: auto_track_options: never: "aldri" immediately: "øyeblikkelig" + after_1_minute: "etter 1 minutt" + after_2_minutes: "etter 2 minutt" + after_3_minutes: "etter 3 minutt" + after_4_minutes: "etter 4 minutt" + after_5_minutes: "etter 5 minut" + after_10_minutes: "etter 10 minutt" invited: search: "skriv for å søke etter invitasjoner..." title: "invitasjoner" @@ -901,6 +926,11 @@ nb_NO: create: 'Nytt emne' create_long: 'Opprett et nytt emne' private_message: 'Begynn en melding' + archive_message: + title: 'Arkiver' + move_to_inbox: + title: 'Flytt til Inbox' + help: 'Flytt meldingen tilbake til Inbox' list: 'Emner' new: 'nytt emne' unread: 'ulest' @@ -1208,6 +1238,11 @@ nb_NO: bookmark: "Angre bokmerke" like: "Angre liker" vote: "Angre stemme" + people: + notify_moderators: "varslet moderatorer" + notify_user: "sendte en melding" + like: "likte dette" + vote: "stemte for dette" by_you: off_topic: "Du rapporterte dette som irrelevant" spam: "Du rapporterte dette som spam" @@ -1570,6 +1605,7 @@ nb_NO: refresh_report: "Refresh Rapport" start_date: "Startdato" end_date: "Sluttdato" + groups: "Alle grupper" commits: latest_changes: "Siste endringer: Vennligst oppgrader ofte!" by: "av" diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 1496da8c88..8042ec3556 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -216,6 +216,7 @@ ar: hot: "عناوين ساخنة" top: "أفضل المواضيع" posts: "اخر المشاركات " + private_posts: "الرسائل الخاصة الآخيرة" too_late_to_edit: "أُنشئ المنشور منذ فترة طويلة جدا، لذا تعديله أو حذفه لم يعد ممكنا." revert_version_same: "ألاصدار الحالي يتطابق مع نفس ألاصدار الذي تحاول استرجاعه ." excerpt_image: "صورة" @@ -1637,6 +1638,7 @@ ar: subject_pm: "[مسائًا]" user_notifications: previous_discussion: "الردود السابقة " + in_reply_to: "في رد لـ " unsubscribe: title: "غير مشترك " description: "لست مهتما في تلقي هذه الرسائل الالكترونيه؟ لا مشكله! اضغط تحت ليتم الغاء اشتركك فورا:" @@ -1769,6 +1771,12 @@ ar: انقر على الرابط التالي لاختيار كلمة مرور لحسابك الجديد: %{base_url}/users/password-reset/%{email_token} + confirm_new_email: + subject_template: "[%{site_name}] تأكيد عنوان بريدك الإلكتروني الجديد" + confirm_old_email: + subject_template: "[%{site_name}] تأكيد عنوان بريدك الإلكتروني الحالي" + notify_old_email: + subject_template: "[%{site_name}] عنوان بريدك الإلكتروني تم تغييره" signup_after_approval: subject_template: "قد وافقت على %{site_name}!" text_body_template: | @@ -1800,7 +1808,7 @@ ar: recent_topics: "الأخيرة" see_more: "المزيد" search_title: "البحث في الموقع" - search_google: "جوجل" + search_google: "غوغل" login_required: welcome_message: | #[أهلاً بكم %{title}](#مرحبًا) @@ -1993,8 +2001,65 @@ ar: title: "سياسة الخصوصية" body: "\n\n## [ما هي البيانات التي نقوم بجمعها؟](#جمع)\n\nنحن نجمع معلومات عنك عندما تسجل في موقعنا، وعندما تشارك في المنتدى عن طريق القراءة أو الكتابة، ونقوم بتقييم ما تم مشاركته هنا .\n\n\nيمكنك زيارة موقعنا بدون تسجيل، ولكن عند التسجيل في موقعنا، سيطلب منك ادخال اسمك وعنوان بريدك الالكتروني، وسيتم التحقق من بريدك الالكتروني بإرسال رسالة الى بريدك الالكتروني تحتوي على رابط خاص، عند الضغط على هذا الرابط، نحن سنعرف أنك مالك البريد الالكتروني المتحكم فيه.\n\nعندما تقوم بالتسجيل في موقعنا والنشر، سنقوم بتسجيل عنوان IP الذي نشرت منه، أيضا قد تحتفظ سجلات الخادم عناوين IP جميع الطلبات من الخادم.\n\n\n\n## [في ماذا نستخدم المعلومات الخاصة بك؟](#استخدام)\n\nيمكننا استخدام المعلومات التي نجمعها عنك بإحدى الطرق التالية:\n\n* لتخصيص تجربتك و mdahs؛ المعلومات الخاصة بك تساعدنا على الاستجابة بشكل أفضل لاحتياجاتك الفردية.\n* لتحسين موقعنا و mdash ؛ نسعى باستمرار لتحسين ما يعرضه الموقع استنادًا الى المعلومات والتغذية الراجعة - الملاحظات - التي نتلقاها منك.\n* لتحسين خدمة العملاء و mdash ؛ المعلومات الخاصة بك تساعدنا على الاستجابة بشكل أكثر فعالية لطلبات الدعم وخدمة العملاء.\n* لإرسال رسائل البريد الالكتروني الدورية و mdash ؛ سنستخدم عنوان البريد الالكتروني الذي وفرته لنا لإرسال معلومات إليك، الاشعارات التي تطلبها حول التحديثات في المواضيع، أو الاستجابة لاسم المستخدم الخاص بك، كالرد على الاستفسارات، او الطلبات أو اسئلة اخرى.\n\n\n\n## [كيف نقوم بحماية معلوماتك ؟](#حماية)\n\nنقوم بتطبيق مجموعة من الإجراءات الأمنية للمحافظة على أمن وسلامة معلوماتك الشخصية، عندما تقوم بإرسال أو إدخال أو الدخول لمعلوماتك الشخصية.\n\n\n\n## [ما هي سياسة الاحتفاظ بالبيانات الخاصة بك ؟](#الاحتفاظ-بالبيانات)\n\nسوف نبذل جهونا بإخلاص للتالي :\n\n* الاحتفاظ بسجلات عناوين IP لجميع الطلبات لهذا الخادم لمدة لا تزيد عن 90 يومًا.\n* الاحتفاظ بعناوين IP الخاصة بالمستخدمين المسجلين ومنشوراتهم لمدة لا تزيد عن 5 سنوات.\n\n\n\n## [هل نستخدم الكعكات - cookies - ملفات تعريف الارتباط ؟ ](#كعكات)\n\nنعم، الكعكات هي عبارة عن ملفات صغيرة يقوم الموقع أو مزود الخدمة بنقلها الى القرص الصلب لحاسبك من خلال متصفحك (اذا سمحتم بذلك)، هذه الكعكات تعرف الموقع على متصفحك، فن كان لديك حساب مسجل، سيتم ربطه مع حسابك.\n\nنحن نستخدم ملفات تعريف الارتباط - cookies - لفهم وحفظ التفضيلات الخاصة بك للزيارات في المستقبل، وجمع البيانات العامة حول حركة المرور والتفاعل في الموقع حتى نتمكن من تقديم تجربة وأدوات افضل في المستقبل، نحن قد نتعاقد مع مقدمي خدمات من الطرف الثالث لمساعدتنا في تحسين فهمنا لزوار الموقع، مقدمي الخدمات لا يسمح لهم بإستخدام المعلومات التي تم جمعها نيابة عنا، إلّا لمساعدتنا في سلوكنا وتحسين أعمالنا.\n\n\n\n## [هل نقوم بالإفصاح عن أي معلومات لأطراف خارجية؟](#إفصاح)\n\nنحن لا نبيع، ولا نتاجر أو ننقل المعلومات الشخصية الى أطراف خارجية. وهذا لا يشمل الطرف الخاجية الموثوق بها والتي تساعد في تشغيل موقعنا، واجراء أعمالنا، أو تقديم الخدمات لكم، طالما أن تلك الأطراف موافقة للحفاظ على سرية المعلومات، يجوز لنا الافراج عن معوماتك الشخصية عندما نرى أنه هو المناسب للإمتثال للقانون، مع فرض سياسة موقعنا، أو حماية حقوقنا أو حقوق الآخرين، أو حقوق الملكية، أو السلامة. ومع ذلك، يمكننا تقديم معلومات الزائرين دون تحديد الهوية، الى أطراف أخرى للتسويق والاعلان، أو غيرها من الاستخدامات.\n\n\n\n## [روابط الطرف الثالث](#الطرف-الثالث)\n\nأحيانًا، نفترض، أنه عند وجود مواقع طرف ثالث تقجم خدمات أو منتجات على موقعنا، كان لدى مواقع الطرف الثالث هذه، سياسات خصوصية منفصلة ومستقلة، لن يكون لدينا أية مسؤولية عن محتوى وأنشطة هذه المواقع المرتبطة، ومع ذلك، نحن نسعى إلى حماية موقعنا وسلامته، ونرحب بأي ملاحظات حول هذه المواقع. \n\n\n\n## [الالتزام بقانون حماية خصوصية الأطفال على الانترنت ](#coppa)\n\nموقعنا والمنتجات والخدمات موجهه للأشخاص اللذين لا تقل أعمارهم عن 13 سنة، إذا كان هذا الخادم في الولايات المتحدة الأمريكية، من شروط COPPA\n ([Children's Online Privacy Protection Act](https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act))\nعدم استخدم هذا الموقع.\n\n\n\n## [سياسة الخصوصية على الانترنت](#متصل)\n\nتنطبق سياسة الخصوصية على الانترنت فقط على المعلومات التي يتم جمعها من خلال موقعنا، ولاتنطبق على المعلومات التي يتم جمعها أثناء عدم الاتصال.\n\n\n\n## [الموافقة](#الموافقة)\n\nبإستخدام موقعنا، أنت توافق على سياسة الخصوصية لموقعنا.\n\n\n\n## [تغييرات على سياسة الخصوصية](#تغييرات)\n\nإذا قمنا بتغيير سياسة الخصوصية، سوف نقوم بنشر هذه التغييرات في هذه الصفحة.\n\nهذه الوثيقة هي نسخة من CC-BY-SA تم تحديثها في 31 مايو عام 2013م .\n" badges: + editor: + name: محرر + basic_user: + name: بسيط + member: + name: عضو + regular: + name: منتظم + leader: + name: قائد welcome: name: مرحباً + description: استقبلت كـ + anniversary: + name: الذكرى السنوية + nice_post: + name: رد رائع + good_post: + name: رد حسن + great_post: + name: رد عظيم + nice_topic: + name: موضوع رائع + good_topic: + name: موضوع حسن + great_topic: + name: موضوع عظيم + first_like: + name: أول إعجاب + first_flag: + name: أول إبلاغ + promoter: + description: عضو غير صحيح + read_guidelines: + name: إقرأ القواعد العامة + reader: + name: قارئ + popular_link: + name: رابط شائع + hot_link: + name: رابط ساخن + famous_link: + name: رابط مشهور + appreciated: + name: مشكور + respected: + name: محترم + crazy_in_love: + name: مجنون واقع في حب + thank_you: + name: شكراً لك + gives_back: + name: أعده + empathetic: + description: لديه 500 إعجاب وأعطى 1000 إعجاب + first_emoji: + name: أول رمز تعبيري + first_mention: + name: أول إشارة admin_login: success: "البريد أُرسل" error: "خطأ!" @@ -2005,6 +2070,8 @@ ar: performance_report: initial_post_raw: 'هذا الموضوع يحتوي على معلومات الاداء اليومي للموقع ' initial_topic_title: التبليغ عن اداء الموقع + topic_invite: + user_exists: "آسف، ذلك المستخدم قد تمت دعوته من قبل. تستطيع فقط أن تدعوا عضواً لموضوعِ مرة واحدة." time: <<: *datetime_formats activemodel: diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml index 7242a74c30..d7b78460ce 100644 --- a/config/locales/server.vi.yml +++ b/config/locales/server.vi.yml @@ -2214,13 +2214,97 @@ vi: description: Trích dẫn một bài viết long_description: | Huy hiệu này được trao cho lần đầu tiên bạn trích dẫn trong một bài trả lời của bạn. Trích dẫn các phần có liên quan trong trả lời của bạn sẽ giúp cho các cuộc thảo luận tập trung vào chủ đề. Điều đó thật dễ dàng: bạn có thể nhanh chóng trích dẫn bằng cách nêu bật một phần bất kỳ của bài viết nào và sử dụng nút Trích Dẫn Trả Lời xuất hiện ở gần vùng chọn. Trích dẫn thoải mái! + read_guidelines: + name: Xem hướng dẫn + description: Xem nguyên tắc cộng đồng + long_description: | + Huy hiệu này được cấp khi bạn xem nguyên tắc cộng đồng. Xem và làm theo những nguyên tắc này sẽ giúp bạn cùng chúng tôi xây dựng một cộng đồng an toàn, bền vững, và đem lại nhiều niềm vui cho tất cả mọi người! + reader: + name: Người xem + description: Đọc từng trả lời trong một chủ đề có hơn 100 trả lời + long_description: | + Huy hiệu này được cấp cho lần đầu tiên bạn đọc một chủ đề dài với hơn 100 trả lời. Theo dõi sát sao một cuộc hội thoại giúp bạn hiểu được những quan điểm khác nhau, và giúp cho cuộc trò chuyện thú vị hơn. Bạn càng đọc, càng trò chuyện được tốt hơn. :slight_smile: + popular_link: + name: Liên kết phổ biến + description: Đăng một liên kết ngoài được 50 click + long_description: | + Huy hiệu này được cấp khi một liên kết mà bạn chia sẻ được 50 click. Cám ơn bạn đã đăng một liên kết hữu ích! + hot_link: + name: Liên kết hấp dẫn + description: Đăng một liên kết ngoài được 300 click + long_description: | + Huy hiệu này được cấp khi một liên kết mà bạn chia sẻ được 300 click. Cám ơn đã đăng một liên kết hấp dẫn giúp kéo cuộc trò chuyện về phía trước! + famous_link: + name: Liên kết nổi tiếng + description: Đăng một liên kết ngoài được 1000 click + long_description: | + Huy hiệu này được cấp khi một liên kết mà bạn chia sẻ được 1000 click. Tuyệt vời! Bạn đã gửi một liên kết cải thiện đáng kể cuộc hội thoại bằng cách bổ sung chi tiết, bối cảnh và thông tin. Làm tốt lắm! + appreciated: + name: Được đánh giá cao + description: Nhận được 1 like cho 20 bài viết + long_description: | + Huy hiệu này được cấp khi bạn nhận được ít nhất 1 like cho 20 bài viết khác nhau. Cộng đồng thích thú với các đóng góp của bạn trong các cuộc đối thoại! + respected: + name: Được tôn trọng + description: Nhận được 2 like cho 100 bài viết + long_description: | + Huy hiệu này được cấp khi bạn nhận được ít nhất 2 like cho 100 bài viết khác nhau. Cộng đồng đang hướng tới tôn trọng những đóng góp của bạn trong các cuộc đối thoại. + admired: + name: Được ngưỡng mộ + description: Nhận được 5 like cho 300 bài viết + long_description: | + Huy hiệu này được cấp khi bạn nhận được ít nhất 5 like cho 300 bài viết khác nhau. Tuyệt vời! Cộng đồng rất ngưỡng mộ các đóng góp thường xuyên có chất lượng cao của bạn trong các cuộc đối thoại. + out_of_love: + name: Vì yêu thích + description: Sử dụng 50 like trong 1 ngày + long_description: | + Huy hiệu này được cấp khi bạn sử dụng tất cả 50 lượt like hàng ngày của bạn. Ghi nhớ một chút các bài viết mà bạn xem và khuyến khích các thành viên cộng đồng tạo ra các cuộc thảo luận lớn hơn trong tương lai. + higher_love: + name: Thích nhiều hơn + description: Sử dụng 50 like một ngày trong 5 ngày + long_description: | + Huy hiệu này được cấp khi bạn sử dụng 50 lượt like một ngày trong 5 ngày liên tiếp. Cám ơn bạn đã dành thời gian để khuyến khích các cuộc hội thoại tốt nhất mỗi ngày! + crazy_in_love: + name: Thích nhiệt tình + description: Sử dụng 50 like một ngày trong 20 ngày + long_description: | + Huy hiệu này được cấp khi bạn sử dụng 50 lượt like một ngày trong 20 ngày liên tiếp. Tuyệt vời! Bạn là một tấm gương thường xuyên khuyến khích các thành viên trong cộng đồng! + thank_you: + name: Cám ơn bạn + description: Nhận được 20 like và đã like 10 lần + long_description: | + Huy hiệu này được cấp khi bạn đã nhận được 20 like cho các bài viết của mình và đã like 10 lần hoặc hơn các bài viết khác. Khi ai đó like bài viết của bạn, bạn tìm thấy lúc để like những gì người khác đăng lại. + gives_back: + name: Tặng lại + description: Nhận được 100 like và đã like 100 lần + long_description: | + Huy hiệu này được cấp khi bạn đã nhận được 100 like và đã like 100 lần hoặc hơn các bài viết khác. Cám ơn bạn đã cho đi để nhận lại yêu thương! + empathetic: + name: Cảm thông + description: Nhận được 500 like và đã like 1000 lần + long_description: | + Huy hiệu này được cấp khi bạn đã nhận được 500 like và đã like 1000 lần hoặc hơn các bài viết khác. Tuyệt vời! Bạn là mẫu người quảng đại và đầy yêu thương :two_hearts:. + first_emoji: + name: Emoji đầu tiên + description: Sử dụng Emoji trong bài viết + long_description: | + Huy hiệu này được cấp khi bạn thêm một biểu tượng Emoji vào bài đăng :heart: + first_mention: + name: Đề cập đầu tiên + description: Đề cập một thành viên trong bài viết + long_description: Huy hiệu này được cấp khi bạn đề cập @mention một thành viên trong bài viết của bạn. @mentions cho phép bạn gửi thông báo cho các thành viên khác trong diễn đàn. admin_login: success: "Gửi mail lỗi" error: "Lỗi!" email_input: "Email quản trị" submit_button: "Gửi email" + discourse_hub: + access_token_problem: "Dành cho admin: Hãy cập nhật đúng discourse_org_access_key trong thiết lập website." performance_report: + initial_post_raw: Chủ đề này bao gồm các báo cáo hiệu suất hàng ngày của website. initial_topic_title: Báo cáo hiệu suất website + topic_invite: + user_exists: "Xin lỗi, thành viên này đã được mời. Bạn chỉ có thể mời một người dùng đến một chủ đề một lần." time: <<: *datetime_formats activemodel: From 84d4ebd9108cbe6c2d948401013ef869160fe666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 25 Apr 2016 20:06:45 +0200 Subject: [PATCH 036/125] use 'reply_by_email_address' setting for handling bounce emails using VERP --- config/locales/server.en.yml | 1 - config/site_settings.yml | 4 ---- lib/email/sender.rb | 7 ++----- spec/components/email/sender_spec.rb | 16 ++++++---------- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index ffb0b9020f..78c60a071f 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -819,7 +819,6 @@ en: title: "The name of this site, as used in the title tag." site_description: "Describe this site in one sentence, as used in the meta description tag." contact_email: "Email address of key contact responsible for this site. Used for critical notifications such as unhandled flags, as well as on the /about contact form for urgent matters." - bounce_email: "Variable Email Return Path used for emails, example: bounce@example.com will cause us to generate bounce+GUID@example.com as the Return Path for emails we send. This feature allows us to automatically disable bouncing emails. Requires additional configurations, leave blank if unsure." contact_url: "Contact URL for this site. Used on the /about contact form for urgent matters." queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken." crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions." diff --git a/config/site_settings.yml b/config/site_settings.yml index 183ff1a555..bc2bb0708b 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -26,10 +26,6 @@ required: client: true default: '' type: email - bounce_email: - default: '' - type: email - shadowed_by_global: true contact_url: client: true default: '' diff --git a/lib/email/sender.rb b/lib/email/sender.rb index 4a682b20cc..e1d0b320b0 100644 --- a/lib/email/sender.rb +++ b/lib/email/sender.rb @@ -116,16 +116,13 @@ module Email @message.header['List-Post'] = "" end - unless SiteSetting.bounce_email.blank? + if SiteSetting.reply_by_email_address.present? && SiteSetting.reply_by_email_address["+"] email_log.bounce_key = SecureRandom.hex - address,domain = SiteSetting.bounce_email.split('@') - address << (address =~ /[+]/ ? "-" : '+') - address << email_log.bounce_key # WARNING: RFC claims you can not set the Return Path header, this is 100% correct # however Rails has special handling for this header and ends up using this value # as the Envelope From address so stuff works as expected - @message.header[:return_path] = "#{address}@#{domain}" + @message.header[:return_path] = SiteSetting.reply_by_email_address.sub("%{reply_key}", "verp-#{email_log.bounce_key}") end email_log.post_id = post_id if post_id.present? diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb index 073890b2fb..89d299dda4 100644 --- a/spec/components/email/sender_spec.rb +++ b/spec/components/email/sender_spec.rb @@ -77,25 +77,21 @@ describe Email::Sender do email_sender.send end - context "adds return_path correctly when no plus addressing" do - before do - SiteSetting.bounce_email = 'bounce@test.com' - end + context "doesn't add return_path when no plus addressing" do + before { SiteSetting.reply_by_email_address = '%{reply_key}@test.com' } When { email_sender.send } Then { - expect(message.header[:return_path].to_s).to eq("bounce+#{EmailLog.last.bounce_key}@test.com") + expect(message.header[:return_path].to_s).to eq("") } end - context "adds return_path correctly with plus addressing" do - before do - SiteSetting.bounce_email = 'bounce+meta@test.com' - end + context "adds return_path with plus addressing" do + before { SiteSetting.reply_by_email_address = 'replies+%{reply_key}@test.com' } When { email_sender.send } Then { - expect(message.header[:return_path].to_s).to eq("bounce+meta-#{EmailLog.last.bounce_key}@test.com") + expect(message.header[:return_path].to_s).to eq("replies+verp-#{EmailLog.last.bounce_key}@test.com") } end From 87efa0edddf3d38325c0ef696efa0e463bc5907f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 25 Apr 2016 14:08:31 -0400 Subject: [PATCH 037/125] FIX: Support HTML entities in topic titles --- .../javascripts/discourse/widgets/header-topic-info.js.es6 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 index 94cbf746db..1b6b8a269e 100644 --- a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 @@ -2,6 +2,7 @@ import { createWidget } from 'discourse/widgets/widget'; import { h } from 'virtual-dom'; import { iconNode } from 'discourse/helpers/fa-icon'; import DiscourseURL from 'discourse/lib/url'; +import RawHtml from 'discourse/widgets/raw-html'; export default createWidget('header-topic-info', { tagName: 'div.extra-info-wrapper', @@ -23,10 +24,12 @@ export default createWidget('header-topic-info', { if (loaded) { heading.push(this.attach('topic-status', attrs)); + + const titleHTML = new RawHtml({ html: `${topic.get('fancyTitle')}` }); heading.push(this.attach('link', { className: 'topic-link', action: 'jumpToTopPost', href: topic.get('url'), - contents: () => topic.get('fancyTitle') })); + contents: () => titleHTML })); } const title = [h('h1', heading)]; From 7a079f6de5a147715bb6d102b95417e77f3e93d3 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 25 Apr 2016 15:23:05 -0400 Subject: [PATCH 038/125] FIX: Add a vdom key to the logo to avoid weird resizing --- app/assets/javascripts/discourse/widgets/home-logo.js.es6 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 index 1a2f01f40a..cfdc2ea3f6 100644 --- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 +++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 @@ -19,16 +19,16 @@ export default createWidget('home-logo', { if (!mobileView && this.attrs.minimized) { const logoSmallUrl = siteSettings.logo_small_url || ''; if (logoSmallUrl.length) { - return h('img#site-logo.logo-small', { attributes: { src: logoSmallUrl, width: 33, height: 33, alt: title } }); + return h('img#site-logo.logo-small', { key: 'logo-small', attributes: { src: logoSmallUrl, width: 33, height: 33, alt: title } }); } else { return iconNode('home'); } } else if (showMobileLogo) { - return h('img#site-logo.logo-big', { attributes: { src: mobileLogoUrl, alt: title } }); + return h('img#site-logo.logo-big', { key: 'logo-mobile', attributes: { src: mobileLogoUrl, alt: title } }); } else if (logoUrl.length) { - return h('img#site-logo.logo-big', { attributes: { src: logoUrl, alt: title } }); + return h('img#site-logo.logo-big', { key: 'logo-big', attributes: { src: logoUrl, alt: title } }); } else { - return h('h2#site-text-logo.text-logo', title); + return h('h2#site-text-logo.text-logo', { key: 'logo-text' }, title); } }, From 2194ccec6e969cbdcbd7f484986f2c24bde4706d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 25 Apr 2016 23:03:17 +0200 Subject: [PATCH 039/125] slightly better automatic flag reason messages --- app/models/post.rb | 12 ++++-------- app/models/user.rb | 12 ++++++++---- app/services/spam_rule/flag_sockpuppets.rb | 7 ++++--- config/locales/server.en.yml | 6 +++--- lib/discourse.rb | 2 +- lib/post_creator.rb | 1 + 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/models/post.rb b/app/models/post.rb index df3d51ed24..981a0ba924 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -229,7 +229,6 @@ class Post < ActiveRecord::Base end def whitelisted_spam_hosts - hosts = SiteSetting .white_listed_spam_host_domains .split('|') @@ -255,7 +254,8 @@ class Post < ActiveRecord::Base TopicLink.where(domain: hosts.keys, user_id: acting_user.id) .group(:domain, :post_id) - .count.each_key do |tuple| + .count + .each_key do |tuple| domain = tuple[0] hosts[domain] = (hosts[domain] || 0) + 1 end @@ -265,13 +265,9 @@ class Post < ActiveRecord::Base # Prevent new users from posting the same hosts too many times. def has_host_spam? - return false if acting_user.present? && acting_user.has_trust_level?(TrustLevel[1]) + return false if acting_user.present? && (acting_user.staged? || acting_user.has_trust_level?(TrustLevel[1])) - total_hosts_usage.each do |_, count| - return true if count >= SiteSetting.newuser_spam_host_threshold - end - - false + total_hosts_usage.values.any? { |count| count >= SiteSetting.newuser_spam_host_threshold } end def archetype diff --git a/app/models/user.rb b/app/models/user.rb index 0909d61760..db2e267ae0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -702,12 +702,16 @@ class User < ActiveRecord::Base # Flag all posts from a user as spam def flag_linked_posts_as_spam - admin = Discourse.system_user + disagreed_flag_post_ids = PostAction.where(post_action_type_id: PostActionType.types[:spam]) + .where.not(disagreed_at: nil) + .pluck(:post_id) - disagreed_flag_post_ids = PostAction.where(post_action_type_id: PostActionType.types[:spam]).where.not(disagreed_at: nil).pluck(:post_id) - topic_links.includes(:post).where.not(post_id: disagreed_flag_post_ids).each do |tl| + topic_links.includes(:post) + .where.not(post_id: disagreed_flag_post_ids) + .each do |tl| begin - PostAction.act(admin, tl.post, PostActionType.types[:spam], message: I18n.t('flag_reason.spam_hosts')) + message = I18n.t('flag_reason.spam_hosts', domain: tl.domain) + PostAction.act(Discourse.system_user, tl.post, PostActionType.types[:spam], message: message) rescue PostAction::AlreadyActed # If the user has already acted, just ignore it end diff --git a/app/services/spam_rule/flag_sockpuppets.rb b/app/services/spam_rule/flag_sockpuppets.rb index 4c96a0687f..b669e80a8a 100644 --- a/app/services/spam_rule/flag_sockpuppets.rb +++ b/app/services/spam_rule/flag_sockpuppets.rb @@ -30,10 +30,11 @@ class SpamRule::FlagSockpuppets end def flag_sockpuppet_users - system_user = Discourse.system_user - PostAction.act(system_user, @post, PostActionType.types[:spam], message: I18n.t('flag_reason.sockpuppet')) rescue PostAction::AlreadyActed + message = I18n.t('flag_reason.sockpuppet', ip_address: @post.user.ip_address) + PostAction.act(Discourse.system_user, @post, PostActionType.types[:spam], message: message) rescue PostAction::AlreadyActed + if (first_post = @post.topic.posts.by_post_number.first).try(:user).try(:new_user?) - PostAction.act(system_user, first_post, PostActionType.types[:spam], message: I18n.t('flag_reason.sockpuppet')) rescue PostAction::AlreadyActed + PostAction.act(Discourse.system_user, first_post, PostActionType.types[:spam], message: message) rescue PostAction::AlreadyActed end end diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 78c60a071f..55aff60189 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1134,7 +1134,7 @@ en: tos_url: "If you have a Terms of Service document hosted elsewhere that you want to use, provide the full URL here." privacy_policy_url: "If you have a Privacy Policy document hosted elsewhere that you want to use, provide the full URL here." - newuser_spam_host_threshold: "How many times a new user can post a link to the same host within their `newuser_spam_host_posts` posts before being considered spam." + newuser_spam_host_threshold: "How many times a new user can post a link to the same host within their `newuser_spam_host_threshold` posts before being considered spam." white_listed_spam_host_domains: "A list of domains excluded from spam host testing. New users will never be restricted from creating posts with links to these domains." staff_like_weight: "How much extra weighting factor to give staff likes." @@ -2389,8 +2389,8 @@ en: missing: "Sorry, we can't find any avatar associated with that email address. Can you try uploading it again?" flag_reason: - sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." - spam_hosts: "This new user tried to create multiple posts with links to the same domain. See the newuser_spam_host_threshold site setting." + sockpuppet: "A new user created a topic, and another new user at the same IP address (%{ip_address}) replied. See the `flag_sockpuppets` site setting." + spam_hosts: "This new user tried to create multiple posts with links to the same domain (%{domain}). See the `newuser_spam_host_threshold` site setting." email_log: no_user: "Can't find user with id %{user_id}" diff --git a/lib/discourse.rb b/lib/discourse.rb index 4d08038dee..762c1c0eaa 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -283,7 +283,7 @@ module Discourse SYSTEM_USER_ID ||= -1 def self.system_user - User.find_by(id: SYSTEM_USER_ID) + @system_user ||= User.find_by(id: SYSTEM_USER_ID) end def self.store diff --git a/lib/post_creator.rb b/lib/post_creator.rb index 39d9711cc3..9f81977ec5 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -102,6 +102,7 @@ class PostCreator setup_post return true if skip_validations? + if @post.has_host_spam? @spam = true errors[:base] << I18n.t(:spamming_host) From 1a890fa9cf28e473775313574cc3908db8292304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 25 Apr 2016 23:51:26 +0200 Subject: [PATCH 040/125] Only ping a maximum of 2 reviewers --- .mention-bot | 1 + 1 file changed, 1 insertion(+) diff --git a/.mention-bot b/.mention-bot index d1999edd24..16c45ceb88 100644 --- a/.mention-bot +++ b/.mention-bot @@ -1,4 +1,5 @@ { + "maxReviewers": 2, "message": "Thanks @pullRequester for your pull request :+1:. By analyzing the blame information on this pull request, I identified @reviewers to be potential reviewers.", "requiredOrgs": ["discourse"] } From 208cf41e6c75de2b9187319c4d617b12d83f3d78 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 25 Apr 2016 17:26:22 -0400 Subject: [PATCH 041/125] FIX: Handle `null` flag values --- app/assets/javascripts/discourse/components/site-header.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6 index b5d4b3e8b1..d8e87bb7d8 100644 --- a/app/assets/javascripts/discourse/components/site-header.js.es6 +++ b/app/assets/javascripts/discourse/components/site-header.js.es6 @@ -91,7 +91,7 @@ const SiteHeaderComponent = MountWidget.extend({ buildArgs() { return { - flagCount: _flagProperties.reduce((prev, cur) => prev + this.get(cur), 0), + flagCount: _flagProperties.reduce((prev, cur) => prev + (this.get(cur) || 0), 0), topic: this._topic, canSignUp: this.get('canSignUp') }; From 7ab5d44c7ccd938ee8c0ecf4676ad76cc1d16ac0 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 25 Apr 2016 17:30:36 -0400 Subject: [PATCH 042/125] Remove unused component --- .../components/header-dropdown.js.es6 | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 app/assets/javascripts/discourse/components/header-dropdown.js.es6 diff --git a/app/assets/javascripts/discourse/components/header-dropdown.js.es6 b/app/assets/javascripts/discourse/components/header-dropdown.js.es6 deleted file mode 100644 index af00290db8..0000000000 --- a/app/assets/javascripts/discourse/components/header-dropdown.js.es6 +++ /dev/null @@ -1,27 +0,0 @@ -export default Ember.Component.extend({ - tagName: 'li', - classNameBindings: [':header-dropdown-toggle', 'active'], - - active: Ember.computed.alias('toggleVisible'), - - actions: { - toggle() { - - if (this.siteSettings.login_required && !this.currentUser) { - this.sendAction('loginAction'); - } else { - if (this.site.mobileView && this.get('mobileAction')) { - this.sendAction('mobileAction'); - return; - } - - if (this.get('action')) { - this.sendAction('action'); - } else { - this.toggleProperty('toggleVisible'); - } - } - this.appEvents.trigger('dropdowns:closeAll'); - } - } -}); From 6fb46fe217efbcd3f094f7c4fa3008bfa40502ab Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 25 Apr 2016 17:50:04 -0400 Subject: [PATCH 043/125] UX: Notification was in the wrong place. --- app/assets/stylesheets/common/base/header.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss index 24e28ba2ba..247fcc4bdd 100644 --- a/app/assets/stylesheets/common/base/header.scss +++ b/app/assets/stylesheets/common/base/header.scss @@ -88,6 +88,15 @@ border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); border-right: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); + + .badge-notification { + top: -10px; + } + + .flagged-posts { + right: 24px; + } + &:after { display: block; position: absolute; From 69f1ea027dc1f32ab8b90640350000a513f5ab51 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Mon, 25 Apr 2016 21:36:28 -0700 Subject: [PATCH 044/125] this style didn't cascade as I expected --- app/assets/stylesheets/common/base/alert.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss index fa69ec0820..2afb3d10ed 100644 --- a/app/assets/stylesheets/common/base/alert.scss +++ b/app/assets/stylesheets/common/base/alert.scss @@ -40,7 +40,7 @@ &.alert-info { background-color: dark-light-diff($tertiary, $secondary, 85%, -65%); color: $primary; - .clickable { + &.clickable { color: $tertiary; } } From d59106cb1596f905386c262822ba140d884e756b Mon Sep 17 00:00:00 2001 From: Nick Ivanter Date: Tue, 26 Apr 2016 19:18:34 +0400 Subject: [PATCH 045/125] FIX: duplicate subfolder prefix in links in digest (#4179) In subfolder installs, the subfolder prefix was getting duplicated in topic and category links in the digest. E.g. http://example.com/forum/forum/t/... --- app/views/user_notifications/digest.html.erb | 8 ++++---- lib/category_badge.rb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index acf396294b..3d7471f731 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -21,7 +21,7 @@ <%- @featured_topics.each_with_index do |t, i| %>
    - <%= raw format_topic_title(t.title) %> + <%= raw format_topic_title(t.title) %>
    <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
    @@ -44,7 +44,7 @@ <%- @new_topics.each do |t| %>
    • - <%= raw format_topic_title(t.title) %> + <%= raw format_topic_title(t.title) %> <%= t.posts_count %> <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
      • @@ -59,7 +59,7 @@
      <%- @new_by_category.first(10).each do |c| %> - <%= c[0].name %> <%= c[1] %> + <%= c[0].name %> <%= c[1] %> <%- end %>
      @@ -74,5 +74,5 @@
      <%=raw(t 'user_notifications.digest.unsubscribe', site_link: html_site_link(@anchor_color), - unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url, key: @unsubscribe_key), {:style=>'color: #' + @anchor_color })) %> + unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url_no_prefix, key: @unsubscribe_key), {:style=>'color: #' + @anchor_color })) %>
      diff --git a/lib/category_badge.rb b/lib/category_badge.rb index 196d17691a..dd1355f7ba 100644 --- a/lib/category_badge.rb +++ b/lib/category_badge.rb @@ -60,7 +60,7 @@ module CategoryBadge class_names = 'badge-category clear-badge' text_color = "##{category.text_color}" description = category.description_text ? "title='#{category.description_text.html_safe}'" : '' - category_url = opts[:absolute_url] ? "#{Discourse.base_url}#{category.url}" : category.url + category_url = opts[:absolute_url] ? "#{Discourse.base_url_no_prefix}#{category.url}" : category.url extra_span_classes = if opts[:inline_style] case (SiteSetting.category_style || :box).to_sym From 6c5548c2e48f298acaaac8811af24db181e30d6b Mon Sep 17 00:00:00 2001 From: shaktikatare1989 Date: Tue, 26 Apr 2016 20:53:21 +0530 Subject: [PATCH 046/125] =?UTF-8?q?Fix:=20Replacing=20custom=20gif=20image?= =?UTF-8?q?=20results=20in=20old=20gif=20appearing=20in=20admin=E2=80=A6?= =?UTF-8?q?=20(#4199)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix: Replacing custom gif image results in old gif appearing in admin page * refactor as per the review comment --- app/assets/javascripts/admin/controllers/admin-emojis.js.es6 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 index 619d08c36f..5277f2feb2 100644 --- a/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-emojis.js.es6 @@ -3,7 +3,8 @@ export default Ember.ArrayController.extend({ actions: { emojiUploaded(emoji) { - this.pushObject(Em.Object.create(emoji)); + emoji.url += "?t=" + new Date().getTime(); + this.pushObject(Ember.Object.create(emoji)); }, destroy(emoji) { From 74b3807f60fb63bb02230f2722fbfb984cde7327 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 26 Apr 2016 22:38:19 +0530 Subject: [PATCH 047/125] FEATURE: new bootstrap mode settings for brand new Discourse community (#4193) * FEATURE: new bootstrap mode settings for brand new Discourse community * new SiteSetting.set_and_log method --- .../discourse/components/global-notice.js.es6 | 8 +++++ .../admin/site_settings_controller.rb | 4 +-- app/jobs/regular/enable_bootstrap_mode.rb | 18 ++++++++++ app/jobs/scheduled/disable_bootstrap_mode.rb | 16 +++++++++ app/models/user.rb | 4 +++ config/locales/client.en.yml | 3 ++ config/locales/server.en.yml | 2 ++ config/site_settings.yml | 11 +++++++ lib/auth/default_current_user_provider.rb | 5 +++ lib/site_setting_extension.rb | 6 ++++ .../controllers/categories_controller_spec.rb | 4 +-- spec/controllers/uploads_controller_spec.rb | 3 +- spec/jobs/disable_bootstrap_mode_spec.rb | 33 +++++++++++++++++++ spec/jobs/enable_bootstrap_mode_spec.rb | 33 +++++++++++++++++++ spec/models/user_spec.rb | 14 ++++++++ 15 files changed, 157 insertions(+), 7 deletions(-) create mode 100644 app/jobs/regular/enable_bootstrap_mode.rb create mode 100644 app/jobs/scheduled/disable_bootstrap_mode.rb create mode 100644 spec/jobs/disable_bootstrap_mode_spec.rb create mode 100644 spec/jobs/enable_bootstrap_mode_spec.rb diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6 index f61798163f..13994f28fb 100644 --- a/app/assets/javascripts/discourse/components/global-notice.js.es6 +++ b/app/assets/javascripts/discourse/components/global-notice.js.es6 @@ -17,6 +17,14 @@ export default Ember.Component.extend(StringBuffer, { notices.push([I18n.t("emails_are_disabled"), 'alert-emails-disabled']); } + if (this.currentUser && this.currentUser.get('staff') && this.siteSettings.bootstrap_mode_enabled) { + if (this.siteSettings.bootstrap_mode_min_users > 0) { + notices.push([I18n.t("bootstrap_mode_enabled", {min_users: this.siteSettings.bootstrap_mode_min_users}), 'alert-bootstrap-mode']); + } else { + notices.push([I18n.t("bootstrap_mode_disabled"), 'alert-bootstrap-mode']); + } + } + if (!_.isEmpty(this.siteSettings.global_notice)) { notices.push([this.siteSettings.global_notice, 'alert-global-notice']); } diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb index b817014780..30ad7cd4af 100644 --- a/app/controllers/admin/site_settings_controller.rb +++ b/app/controllers/admin/site_settings_controller.rb @@ -10,9 +10,7 @@ class Admin::SiteSettingsController < Admin::AdminController value = params[id] value.strip! if value.is_a?(String) begin - prev_value = SiteSetting.send(id) - SiteSetting.set(id, value) - StaffActionLogger.new(current_user).log_site_setting_change(id, prev_value, value) if SiteSetting.has_setting?(id) + SiteSetting.set_and_log(id, value, current_user) render nothing: true rescue Discourse::InvalidParameters => e render json: {errors: [e.message]}, status: 422 diff --git a/app/jobs/regular/enable_bootstrap_mode.rb b/app/jobs/regular/enable_bootstrap_mode.rb new file mode 100644 index 0000000000..fcbd5b2921 --- /dev/null +++ b/app/jobs/regular/enable_bootstrap_mode.rb @@ -0,0 +1,18 @@ +module Jobs + class EnableBootstrapMode < Jobs::Base + sidekiq_options queue: 'critical' + + def execute(args) + raise Discourse::InvalidParameters.new(:user_id) unless args[:user_id].present? + return if SiteSetting.bootstrap_mode_enabled + + user = User.find_by(id: args[:user_id]) + return unless user.is_singular_admin? + + # let's enable bootstrap mode settings + SiteSetting.set_and_log('default_trust_level', TrustLevel[1]) + SiteSetting.set_and_log('default_email_digest_frequency', 1440) + SiteSetting.set_and_log('bootstrap_mode_enabled', true) + end + end +end diff --git a/app/jobs/scheduled/disable_bootstrap_mode.rb b/app/jobs/scheduled/disable_bootstrap_mode.rb new file mode 100644 index 0000000000..ae1707c37f --- /dev/null +++ b/app/jobs/scheduled/disable_bootstrap_mode.rb @@ -0,0 +1,16 @@ +module Jobs + class DisableBootstrapMode < Jobs::Scheduled + every 1.day + + def execute(args) + return unless SiteSetting.bootstrap_mode_enabled + total_users = User.where.not(id: Discourse::SYSTEM_USER_ID).count + + if SiteSetting.bootstrap_mode_min_users == 0 || total_users > SiteSetting.bootstrap_mode_min_users + SiteSetting.set_and_log('default_trust_level', TrustLevel[0]) + SiteSetting.set_and_log('default_email_digest_frequency', 10080) + SiteSetting.set_and_log('bootstrap_mode_enabled', false) + end + end + end +end diff --git a/app/models/user.rb b/app/models/user.rb index db2e267ae0..8d68c337b0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -845,6 +845,10 @@ class User < ActiveRecord::Base custom_fields["master_id"].to_i > 0 end + def is_singular_admin? + User.where(admin: true).where.not(id: id).where.not(id: Discourse::SYSTEM_USER_ID).blank? + end + protected def badge_grant diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index d58b84c7c2..482b17ee35 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -147,6 +147,9 @@ en: emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent." + bootstrap_mode_enabled: "To make launching your new site easier, you are in bootstrap mode. All new users will be granted trust level 1 and have daily email digest updates enabled. This will be automatically turned off when total user count exceeds %{min_users} users." + bootstrap_mode_disabled: "Bootstrap mode will be disabled in next 24 hours." + s3: regions: us_east_1: "US East (N. Virginia)" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 55aff60189..4b19733f5a 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1272,6 +1272,8 @@ en: delete_drafts_older_than_n_days: Delete drafts older than (n) days. + bootstrap_mode_min_users: "Minimum number of users required to disable bootstrap mode (set to 0 to disable)" + vacuum_db_days: "Run VACUUM ANALYZE to reclaim DB space after migrations (set to 0 to disable)" prevent_anons_from_downloading_files: "Prevent anonymous users from downloading attachments. WARNING: this will prevent any non-image site assets posted as attachments from working." diff --git a/config/site_settings.yml b/config/site_settings.yml index bc2bb0708b..ea6fdf5324 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1090,6 +1090,17 @@ uncategorized: default: -1 hidden: true + bootstrap_mode_min_users: + default: 50 + client: true + min: 0 + max: 5000 + + bootstrap_mode_enabled: + default: false + client: true + hidden: true + automatically_unpin_topics: default: true client: true diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb index 1e5cec773a..0bc2bf34e7 100644 --- a/lib/auth/default_current_user_provider.rb +++ b/lib/auth/default_current_user_provider.rb @@ -68,6 +68,7 @@ class Auth::DefaultCurrentUserProvider end cookies.permanent[TOKEN_COOKIE] = { value: user.auth_token, httponly: true } make_developer_admin(user) + enable_bootstrap_mode(user) @env[CURRENT_USER_KEY] = user end @@ -81,6 +82,10 @@ class Auth::DefaultCurrentUserProvider end end + def enable_bootstrap_mode(user) + Jobs.enqueue(:enable_bootstrap_mode, user_id: user.id) if user.admin && user.last_seen_at.nil? && !SiteSetting.bootstrap_mode_enabled && user.is_singular_admin? + end + def log_off_user(session, cookies) if SiteSetting.log_out_strict && (user = current_user) user.auth_token = nil diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb index 90870a4673..4395a8c907 100644 --- a/lib/site_setting_extension.rb +++ b/lib/site_setting_extension.rb @@ -371,6 +371,12 @@ module SiteSettingExtension end end + def set_and_log(name, value, user=Discourse.system_user) + prev_value = send(name) + set(name, value) + StaffActionLogger.new(user).log_site_setting_change(name, prev_value, value) if has_setting?(name) + end + protected def clear_cache! diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb index d9d9240b54..4850d5f36a 100644 --- a/spec/controllers/categories_controller_spec.rb +++ b/spec/controllers/categories_controller_spec.rb @@ -64,7 +64,7 @@ describe CategoriesController do expect(category.slug).to eq("hello-cat") expect(category.color).to eq("ff0") expect(category.auto_close_hours).to eq(72) - expect(UserHistory.count).to eq(1) + expect(UserHistory.count).to eq(4) # 1 + 3 (bootstrap mode) end end end @@ -228,7 +228,7 @@ describe CategoriesController do "everyone" => CategoryGroup.permission_types[:create_post] } - expect(UserHistory.count).to eq(2) + expect(UserHistory.count).to eq(5) # 2 + 3 (bootstrap mode) end end end diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb index 4a57897e77..90c3426b17 100644 --- a/spec/controllers/uploads_controller_spec.rb +++ b/spec/controllers/uploads_controller_spec.rb @@ -77,9 +77,8 @@ describe UploadsController do end it 'correctly sets retain_hours for admins' do - Jobs.expects(:enqueue).with(:create_thumbnails, anything) - log_in :admin + Jobs.expects(:enqueue).with(:create_thumbnails, anything) message = MessageBus.track_publish do xhr :post, :create, file: logo, retain_hours: 100, type: "profile_background" diff --git a/spec/jobs/disable_bootstrap_mode_spec.rb b/spec/jobs/disable_bootstrap_mode_spec.rb new file mode 100644 index 0000000000..96f11ceac3 --- /dev/null +++ b/spec/jobs/disable_bootstrap_mode_spec.rb @@ -0,0 +1,33 @@ +require 'rails_helper' + +describe Jobs::DisableBootstrapMode do + + context '.execute' do + let(:admin) { Fabricate(:admin) } + + before do + SiteSetting.bootstrap_mode_enabled = true + end + + it 'does not execute if bootstrap mode is already disabled' do + SiteSetting.bootstrap_mode_enabled = false + StaffActionLogger.any_instance.expects(:log_site_setting_change).never + Jobs::DisableBootstrapMode.new.execute(user_id: admin.id) + end + + it 'turns off bootstrap mode if bootstrap_mode_min_users is set to 0' do + SiteSetting.bootstrap_mode_min_users = 0 + StaffActionLogger.any_instance.expects(:log_site_setting_change).times(3) + Jobs::DisableBootstrapMode.new.execute(user_id: admin.id) + end + + it 'successfully turns off bootstrap mode' do + SiteSetting.bootstrap_mode_min_users = 5 + 6.times do + Fabricate(:user) + end + StaffActionLogger.any_instance.expects(:log_site_setting_change).times(3) + Jobs::DisableBootstrapMode.new.execute(user_id: admin.id) + end + end +end diff --git a/spec/jobs/enable_bootstrap_mode_spec.rb b/spec/jobs/enable_bootstrap_mode_spec.rb new file mode 100644 index 0000000000..c0441bc5fc --- /dev/null +++ b/spec/jobs/enable_bootstrap_mode_spec.rb @@ -0,0 +1,33 @@ +require 'rails_helper' + +describe Jobs::EnableBootstrapMode do + + context '.execute' do + let(:admin) { Fabricate(:admin) } + + before do + SiteSetting.bootstrap_mode_enabled = false + end + + it 'raises an error when user_id is missing' do + expect { Jobs::EnableBootstrapMode.new.execute({}) }.to raise_error(Discourse::InvalidParameters) + end + + it 'does not execute if bootstrap mode is already enabled' do + SiteSetting.bootstrap_mode_enabled = true + StaffActionLogger.any_instance.expects(:log_site_setting_change).never + Jobs::EnableBootstrapMode.new.execute(user_id: admin.id) + end + + it 'does not turn on bootstrap mode if first admin already exists' do + first_admin = Fabricate(:admin) + StaffActionLogger.any_instance.expects(:log_site_setting_change).never + Jobs::EnableBootstrapMode.new.execute(user_id: admin.id) + end + + it 'successfully turns on bootstrap mode' do + StaffActionLogger.any_instance.expects(:log_site_setting_change).times(3) + Jobs::EnableBootstrapMode.new.execute(user_id: admin.id) + end + end +end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 42575c62f5..92e12e9e71 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -330,6 +330,20 @@ describe User do end end + describe '.is_singular_admin?' do + it 'returns true if user is singular admin' do + admin = Fabricate(:admin) + expect(admin.is_singular_admin?).to eq(true) + end + + it 'returns false if user is not the only admin' do + admin = Fabricate(:admin) + second_admin = Fabricate(:admin) + + expect(admin.is_singular_admin?).to eq(false) + end + end + describe 'name heuristics' do it 'is able to guess a decent name from an email' do expect(User.suggest_name('sam.saffron@gmail.com')).to eq('Sam Saffron') From 33b192ba61ab2932467512a1ea262d6faaae6900 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 26 Apr 2016 13:16:51 -0400 Subject: [PATCH 048/125] FIX: Middle clicking on the logo in Firefox --- app/assets/javascripts/discourse/widgets/home-logo.js.es6 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 index cfdc2ea3f6..408b7da13b 100644 --- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 +++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 @@ -37,8 +37,7 @@ export default createWidget('home-logo', { }, click(e) { - // if they want to open in a new tab, let it so - if (e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) { return true; } + if (e.shiftKey || e.metaKey || e.ctrlKey || e.button !== 0) { return true; } e.preventDefault(); From 821103cad53b82d52e26ee3d00c235be64be94c0 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 26 Apr 2016 13:19:22 -0400 Subject: [PATCH 049/125] FIX: Middle clicking on user notifications --- .../javascripts/discourse/widgets/notification-item.js.es6 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 index a5563d81fe..5b130fc4f5 100644 --- a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 +++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 @@ -96,8 +96,6 @@ createWidget('notification-item', { }, click(e) { - if (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey) { return; } - e.preventDefault(); this.attrs.set('read', true); const id = this.attrs.id; @@ -105,6 +103,9 @@ createWidget('notification-item', { if (document && document.cookie) { document.cookie = `cn=${id}; expires=Fri, 31 Dec 9999 23:59:59 GMT`; } + if (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey || e.button !== 0) { return; } + e.preventDefault(); + this.sendWidgetEvent('linkClicked'); DiscourseURL.routeTo(this.url()); } From b34f55d880983fc8040433b9cec93e8c728321ed Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 26 Apr 2016 13:29:46 -0400 Subject: [PATCH 050/125] FIX: Missing `alt` tag on user notifications --- .../widgets/notification-item.js.es6 | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 index 5b130fc4f5..f152403ee6 100644 --- a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 +++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 @@ -58,14 +58,9 @@ createWidget('notification-item', { return Ember.isEmpty(title) ? "" : Discourse.Utilities.escapeExpression(title); }, - text() { - const attrs = this.attrs; + text(notificationType, notName) { + const { attrs } = this; const data = attrs.data; - - const notificationType = attrs.notification_type; - - const lookup = this.site.get('notificationLookup'); - const notName = lookup[notificationType]; const scope = (notName === 'custom') ? data.message : `notifications.${notName}`; if (notificationType === GROUP_SUMMARY_TYPE) { @@ -89,10 +84,15 @@ createWidget('notification-item', { return I18n.t(scope, {description, username}); }, - html() { - const contents = new RawHtml({ html: `
      ${Discourse.Emoji.unescape(this.text())}
      ` }); - const url = this.url(); - return url ? h('a', { attributes: { href: url, 'data-auto-route': true } }, contents) : contents; + html(attrs) { + const notificationType = attrs.notification_type; + const lookup = this.site.get('notificationLookup'); + const notName = lookup[notificationType]; + + const contents = new RawHtml({ html: `
      ${Discourse.Emoji.unescape(this.text(notificationType, notName))}
      ` }); + const href = this.url(); + const alt = I18n.t(`notifications.alt.${notName}`); + return href ? h('a', { attributes: { href, alt } }, contents) : contents; }, click(e) { From de82bd946d80733c764d6960ba91ccd6777d15eb Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 26 Apr 2016 14:17:53 -0400 Subject: [PATCH 051/125] FIX: Group members should be able to see their groups even if private --- lib/guardian.rb | 6 +++++- spec/components/guardian_spec.rb | 11 +++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/guardian.rb b/lib/guardian.rb index 576d477b13..5821e6c037 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -122,7 +122,11 @@ class Guardian end def can_see_group?(group) - group.present? && (is_admin? || group.visible?) + return false if group.blank? + return true if is_admin? || group.visible? + return false if user.blank? + + group.group_users.where(user_id: user.id).exists? end diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index c7a5146f63..5a6d9776fd 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -362,17 +362,24 @@ describe Guardian do describe 'a Group' do let(:group) { Group.new } - let(:invisible_group) { Group.new(visible: false) } + let(:invisible_group) { Group.new(visible: false, name: 'invisible') } it "returns true when the group is visible" do expect(Guardian.new.can_see?(group)).to be_truthy end - it "returns true when the group is visible but the user is an admin" do + it "returns true when the group is invisible but the user is an admin" do admin = Fabricate.build(:admin) expect(Guardian.new(admin).can_see?(invisible_group)).to be_truthy end + it "returns true when the group is invisible but the user is a member" do + invisible_group.save! + member = Fabricate.build(:user) + GroupUser.create(group: invisible_group, user: member) + expect(Guardian.new(member).can_see?(invisible_group)).to be_truthy + end + it "returns false when the group is invisible" do expect(Guardian.new.can_see?(invisible_group)).to be_falsey end From 905068cf23c650e4ee2b110f7a2d72f17fb10917 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 26 Apr 2016 14:24:36 -0400 Subject: [PATCH 052/125] FIX: Santized HTML entities on group page --- .../javascripts/discourse/templates/components/group-post.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs index c661dbe345..45a1642281 100644 --- a/app/assets/javascripts/discourse/templates/components/group-post.hbs +++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs @@ -3,7 +3,7 @@
      {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
       {{format-date post.created_at leaveAgo="true"}} - {{post.topic.fancyTitle}} + {{{post.topic.fancyTitle}}} {{category-link post.category}}
      From 7a01d575c25871a4f593d40a964776398ec9ac7b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 26 Apr 2016 15:03:44 -0400 Subject: [PATCH 053/125] FIX: Make embeddable discourse more forgiving with https --- public/javascripts/embed.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/javascripts/embed.js b/public/javascripts/embed.js index 33c11d337a..4412a33c11 100644 --- a/public/javascripts/embed.js +++ b/public/javascripts/embed.js @@ -63,9 +63,13 @@ return top; } + function normalizeUrl(url) { + return url.replace(/^https?(\:\/\/)?/, ''); + } + function postMessageReceived(e) { if (!e) { return; } - if (DE.discourseUrl.indexOf(e.origin) === -1) { return; } + if (normalizeUrl(DE.discourseUrl).indexOf(normalizeUrl(e.origin)) === -1) { return; } if (e.data) { if (e.data.type === 'discourse-resize' && e.data.height) { From 9fdea6cd46a4c31521c4d4e41c43d5ecf6b86c37 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 26 Apr 2016 17:54:52 -0400 Subject: [PATCH 054/125] FIX: Broken similar topics --- .../javascripts/discourse/widgets/search-menu-results.js.es6 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 index 5d6e03a82c..d057d196e5 100644 --- a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 +++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 @@ -12,7 +12,9 @@ class Highlighted extends RawHtml { } decorate($html) { - $html.highlight(this.term.split(/\s+/), { className: 'search-highlight' }); + if (this.term) { + $html.highlight(this.term.split(/\s+/), { className: 'search-highlight' }); + } } } From 8df69dba83d733038dfb2afe46146875538a5f3a Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 27 Apr 2016 13:57:10 +0800 Subject: [PATCH 055/125] UX: Always show button to mark notifications as read. --- .../controllers/user-notifications.js.es6 | 2 -- .../templates/user/notifications-index.hbs | 16 ++++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 index e39d9a67c5..b61c7d45f6 100644 --- a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 @@ -5,8 +5,6 @@ export default Ember.ArrayController.extend({ this.set("controllers.application.showFooter", !this.get("model.canLoadMore")); }.observes("model.canLoadMore"), - showDismissButton: Ember.computed.gt('user.total_unread_notifications', 0), - currentPath: Em.computed.alias('controllers.application.currentPath'), actions: { diff --git a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs index 5d2e184b81..0ea5830ad6 100644 --- a/app/assets/javascripts/discourse/templates/user/notifications-index.hbs +++ b/app/assets/javascripts/discourse/templates/user/notifications-index.hbs @@ -8,20 +8,16 @@
      {{/if}} -{{#if showDismissButton}} -
      - -
      -{{/if}} +
      + +
      {{user-notifications-large notifications=model}} {{#conditional-loading-spinner condition=loading}} {{#unless model.canLoadMore}} - {{#if showDismissButton}} -
      - -
      - {{/if}} +
      + +
      {{/unless}} {{/conditional-loading-spinner}} From ea1cf28d5c3c5924c9ab2d0e8532258b5f64f0dd Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 03:11:45 -0700 Subject: [PATCH 056/125] use docker-setup instead of nano --- docs/INSTALL-cloud.md | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 48a37b3a35..b7970a100a 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -39,33 +39,30 @@ This command installs the latest versions of Docker and Git on your server. Alte # Install Discourse -Create a `/var/discourse` folder, clone the [Official Discourse Docker Image][dd] into it, and make a copy of the config file as `app.yml`: +Create a `/var/discourse` folder, clone the [Official Discourse Docker Image][dd] into it: sudo -s mkdir /var/discourse git clone https://github.com/discourse/discourse_docker.git /var/discourse cd /var/discourse - cp samples/standalone.yml containers/app.yml You will need to be root through the rest of the bootstrap process. # Edit Discourse Configuration -Edit the Discourse config file `app.yml`: +Launch the setup tool at - nano containers/app.yml + ./discourse-setup -We recommend Nano because it's simple; just use your arrow keys to edit. +Answer the following questions when prompted: -- Set `DISCOURSE_DEVELOPER_EMAILS` to your email address. + Hostname for your Discourse? [discourse.example.com]: + Email address for admin account? [me@example.com]: + SMTP server address? [smtp.example.com]: + SMTP user name? [postmaster@discourse.example.com]: + SMTP password? []: -- Set `DISCOURSE_HOSTNAME` to `discourse.example.com`, this means you want your Discourse available at `http://discourse.example.com/`. You'll need to update the DNS A record for this domain with the IP address of your server. - -- Place your [Email Server credentials][mailconfig] in `DISCOURSE_SMTP_ADDRESS`, `DISCOURSE_SMTP_PORT`, `DISCOURSE_SMTP_USER_NAME`, `DISCOURSE_SMTP_PASSWORD`. Be sure you remove the comment `#` character and space from the front of these lines as necessary. - - - -Please be careful while editing and double check your work; YAML is _very_ sensitive to incorrect spacing and misplaced characters. After completing your edits, press CtrlO then Enter to save and CtrlX to exit. +This will generate an `app.yml` configuration file on your behalf, and then kick off bootstrap. # Email Is Important @@ -79,13 +76,9 @@ Please be careful while editing and double check your work; YAML is _very_ sensi If you need to change or fix your email settings after bootstrapping, you must edit the `app.yml` file again and `./launcher rebuild app`, otherwise your changes will not take effect. If you didn't receive an email from your install, read [Register New Account and Become Admin](#register-new-account-and-become-admin) for troubleshooting. -# Bootstrap Discourse +# Start Discourse -Save the `app.yml` file, and begin bootstrapping Discourse: - - ./launcher bootstrap app - -This command takes between **2-8 minutes** to automagically configure your Discourse. After that completes, start Discourse: +Bootstrapping takes between **2-8 minutes** to set up your Discourse. After that completes, start Discourse: ./launcher start app From f96cfd024c2ad52a9919e81162924fe4254e9f2b Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 03:48:26 -0700 Subject: [PATCH 057/125] Update INSTALL-cloud.md --- docs/INSTALL-cloud.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index b7970a100a..1dd34910ad 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -92,15 +92,15 @@ Your Discourse should be accessible in your web browser via the domain name `dis # Register New Account and Become Admin -There is a reminder at the top about the `DISCOURSE_DEVELOPER_EMAILS` you entered previously in `app.yml`; register a new account using one of those email addresses, and your account will automatically be made an Admin. +Register a new admin account using one of the email addresses you entered before bootstrapping. -(If you *don't* get any email from your install, and are unable to register a new admin account, please check the logs at `/var/discourse/shared/standalone/log/rails/production.log` and see our [Email Troubleshooting checklist](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326).) +(If you *don't* get any email from your install, and are unable to register your admin account, check the logs at `/var/discourse/shared/standalone/log/rails/production.log` and see our [Email Troubleshooting checklist](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326).) You should see Staff topics and **READ ME FIRST: Admin Quick Start Guide**. This guide contains the next steps for further configuring and customizing your Discourse install as an administrator. Read it closely! -(If you are still unable to register a new admin account via email, see [Create Admin Account from Console](https://meta.discourse.org/t/create-admin-account-from-console/17274), but please note that *you will have a broken site* unless you get email working on your instance.) +(If you are unable to register a new admin account via email, see [Create Admin Account from Console](https://meta.discourse.org/t/create-admin-account-from-console/17274), but please note that *you will have a broken site* unless you get email working on your instance.) # Post-Install Maintenance From f4b8385508d081ddb54e8eb21047d80263b22050 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 03:51:56 -0700 Subject: [PATCH 058/125] tone down the hysteria a bit on email --- docs/INSTALL-cloud.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 1dd34910ad..20d5aec7b1 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -74,7 +74,7 @@ This will generate an `app.yml` configuration file on your behalf, and then kick - For proper email deliverability, you must set correct SPF and DKIM records in your DNS. See your email provider instructions for specifics. -If you need to change or fix your email settings after bootstrapping, you must edit the `app.yml` file again and `./launcher rebuild app`, otherwise your changes will not take effect. If you didn't receive an email from your install, read [Register New Account and Become Admin](#register-new-account-and-become-admin) for troubleshooting. +If you need to change or fix your email settings after bootstrapping, you must edit your `app.yml` file and `./launcher rebuild app`, otherwise your changes will not take effect. # Start Discourse @@ -94,7 +94,7 @@ Your Discourse should be accessible in your web browser via the domain name `dis Register a new admin account using one of the email addresses you entered before bootstrapping. -(If you *don't* get any email from your install, and are unable to register your admin account, check the logs at `/var/discourse/shared/standalone/log/rails/production.log` and see our [Email Troubleshooting checklist](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326).) +(If you are unable to register your admin account, check the logs at `/var/discourse/shared/standalone/log/rails/production.log` and see our [Email Troubleshooting checklist](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326).) From 92a6bf4f9d8973555cb6604034474f945ce0ebd0 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 04:07:00 -0700 Subject: [PATCH 059/125] better cropped image --- docs/INSTALL-cloud.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 20d5aec7b1..8285c8efe2 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -88,7 +88,7 @@ Congratulations! You just built your very own Discourse! Your Discourse should be accessible in your web browser via the domain name `discourse.example.com` you entered earlier, provided you configured DNS. If not, you can visit the server IP directly, e.g. `http://192.168.1.1`. - + # Register New Account and Become Admin From 7151c16c79bdf1cc652f7cbe5fd0692a58978c0a Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 27 Apr 2016 16:34:44 +0530 Subject: [PATCH 060/125] FEATURE: create permalink when category slug is changed --- app/models/category.rb | 21 +++++++++++++++++++++ spec/models/category_spec.rb | 24 ++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/app/models/category.rb b/app/models/category.rb index 520c86c07f..37142c7f86 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -46,6 +46,9 @@ class Category < ActiveRecord::Base after_update :rename_category_definition, if: :name_changed? + after_create :delete_category_permalink + after_update :create_category_permalink, if: :slug_changed? + after_save :publish_discourse_stylesheet has_one :category_search_data @@ -447,6 +450,24 @@ SQL end end + def create_category_permalink + old_slug = changed_attributes["slug"] + if self.parent_category + Permalink.create(url: "c/#{self.parent_category.slug}/#{old_slug}", category_id: id) + else + Permalink.create(url: "c/#{old_slug}", category_id: id) + end + end + + def delete_category_permalink + if self.parent_category + permalink = Permalink.find_by_url("c/#{self.parent_category.slug}/#{slug}") + else + permalink = Permalink.find_by_url("c/#{slug}") + end + permalink.destroy if permalink + end + def publish_discourse_stylesheet DiscourseStylesheets.cache.clear end diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb index 4506c0bbe3..c35875b0b8 100644 --- a/spec/models/category_spec.rb +++ b/spec/models/category_spec.rb @@ -316,6 +316,30 @@ describe Category do expect { @category.update_attributes(name: 'Troutfishing', topic_id: nil) }.to_not raise_error end + it "creates permalink when category slug is changed" do + @category.update_attributes(slug: 'new-category') + expect(Permalink.count).to eq(1) + end + + it "creates permalink when sub category slug is changed" do + sub_category = Fabricate(:category, slug: 'sub-category', parent_category_id: @category.id) + sub_category.update_attributes(slug: 'new-sub-category') + expect(Permalink.count).to eq(1) + end + + it "deletes permalink when category slug is reused" do + Fabricate(:permalink, url: "/c/bikeshed-category") + Fabricate(:category, slug: 'bikeshed-category') + expect(Permalink.count).to eq(0) + end + + it "deletes permalink when sub category slug is reused" do + Fabricate(:permalink, url: "/c/main-category/sub-category") + main_category = Fabricate(:category, slug: 'main-category') + Fabricate(:category, slug: 'sub-category', parent_category_id: main_category.id) + expect(Permalink.count).to eq(0) + end + it "should not set its description topic to auto-close" do category = Fabricate(:category, name: 'Closing Topics', auto_close_hours: 1) expect(category.topic.auto_close_at).to be_nil From e5918c7d002da4a963e57b854e759f05b49b1d9e Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 25 Apr 2016 15:55:15 -0400 Subject: [PATCH 061/125] FEATURE: Merge tagging plugin into core --- .gitignore | 2 - app/assets/javascripts/discourse.js | 1 + .../adapters/tag-notification.js.es6 | 7 + .../components/composer-editor.js.es6 | 17 ++ .../discourse/components/d-editor.js.es6 | 24 ++- .../components/discourse-tag-bound.js.es6 | 13 ++ .../discourse/components/tag-chooser.js.es6 | 97 +++++++++ .../discourse/components/tag-drop-link.js.es6 | 29 +++ .../discourse/components/tag-drop.js.es6 | 113 +++++++++++ .../tag-notifications-button.js.es6 | 11 + .../discourse/controllers/composer.js.es6 | 8 + .../discourse/controllers/history.js.es6 | 12 ++ .../discourse/controllers/rename-tag.js.es6 | 25 +++ .../discourse/controllers/tags-index.js.es6 | 15 ++ .../discourse/controllers/tags-show.js.es6 | 133 ++++++++++++ .../controllers/topic-bulk-actions.js.es6 | 13 ++ .../discourse/controllers/topic.js.es6 | 5 + .../discourse/helpers/discouse-tag.js.es6 | 6 + .../discourse/lib/category-tag-search.js.es6 | 65 ++++++ .../discourse/lib/link-tag-hashtag.js.es6 | 52 +++++ .../discourse/lib/render-tag.js.es6 | 37 ++++ .../discourse/lib/tag-hashtags.js.es6 | 1 + .../discourse/models/composer.js.es6 | 6 +- .../javascripts/discourse/models/topic.js.es6 | 18 ++ .../discourse/routes/app-route-map.js.es6 | 12 ++ .../discourse/routes/tags-index.js.es6 | 12 ++ .../discourse/routes/tags-show.js.es6 | 137 +++++++++++++ .../discourse/templates/bulk-tag.hbs | 5 + .../category-tag-autocomplete.raw.hbs | 13 ++ .../templates/components/bread-crumbs.hbs | 4 + .../components/discourse-tag-bound.hbs | 1 + .../templates/components/tag-drop.hbs | 21 ++ .../templates/components/topic-category.hbs | 7 + .../discourse/templates/composer.hbs | 3 + .../discourse/templates/full-page-search.hbs | 3 + .../templates/list/topic-list-item.raw.hbs | 7 + .../mobile/list/topic_list_item.raw.hbs | 8 + .../discourse/templates/modal/history.hbs | 13 ++ .../discourse/templates/rename-tag.hbs | 13 ++ .../javascripts/discourse/templates/tags.hbs | 9 + .../discourse/templates/tags/index.hbs | 15 ++ .../discourse/templates/tags/show.hbs | 58 ++++++ .../javascripts/discourse/templates/topic.hbs | 4 + .../discourse/views/rename-tag.js.es6 | 5 + .../discourse/views/tags-show.js.es6 | 3 + .../discourse/widgets/hamburger-menu.js.es6 | 4 + .../widgets/header-topic-info.js.es6 | 8 + .../stylesheets/common/base/tagging.scss | 192 ++++++++++++++++++ app/controllers/tags_controller.rb | 192 ++++++++++++++++++ app/helpers/topics_helper.rb | 9 + app/models/topic.rb | 6 + app/models/topic_list.rb | 7 +- app/serializers/site_serializer.rb | 30 ++- app/serializers/topic_list_item_serializer.rb | 10 +- app/serializers/topic_list_serializer.rb | 10 +- app/serializers/topic_view_serializer.rb | 3 +- app/views/list/list.erb | 8 + app/views/topics/show.html.erb | 12 ++ config/locales/client.de.yml | 34 ++++ config/locales/client.en.yml | 61 ++++++ config/locales/client.es.yml | 56 +++++ config/locales/client.fa_IR.yml | 29 +++ config/locales/client.fi.yml | 29 +++ config/locales/client.fr.yml | 28 +++ config/locales/client.nb_NO.yml | 29 +++ config/locales/client.pl_PL.yml | 6 + config/locales/client.pt.yml | 27 +++ config/locales/client.pt_BR.yml | 54 +++++ config/locales/client.ru.yml | 32 +++ config/locales/client.tr_TR.yml | 28 +++ config/locales/client.zh_CN.yml | 54 +++++ config/locales/server.de.yml | 19 ++ config/locales/server.en.yml | 21 ++ config/locales/server.es.yml | 19 ++ config/locales/server.fa_IR.yml | 7 + config/locales/server.fi.yml | 7 + config/locales/server.fr.yml | 7 + config/locales/server.pl_PL.yml | 7 + config/locales/server.pt_BR.yml | 19 ++ config/locales/server.tr_TR.yml | 7 + config/locales/server.zh_CN.yml | 18 ++ config/routes.rb | 23 +++ config/site_settings.yml | 54 +++++ lib/discourse_tagging.rb | 116 +++++++++++ lib/guardian.rb | 12 ++ lib/plugin/instance.rb | 4 + lib/post_creator.rb | 10 + lib/post_revisor.rb | 48 +++++ lib/pretty_text.rb | 17 ++ lib/search.rb | 11 + lib/topic_creator.rb | 6 + lib/topic_query.rb | 32 +++ lib/topics_bulk_action.rb | 19 +- 93 files changed, 2484 insertions(+), 20 deletions(-) create mode 100644 app/assets/javascripts/discourse/adapters/tag-notification.js.es6 create mode 100644 app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 create mode 100644 app/assets/javascripts/discourse/components/tag-chooser.js.es6 create mode 100644 app/assets/javascripts/discourse/components/tag-drop-link.js.es6 create mode 100644 app/assets/javascripts/discourse/components/tag-drop.js.es6 create mode 100644 app/assets/javascripts/discourse/components/tag-notifications-button.js.es6 create mode 100644 app/assets/javascripts/discourse/controllers/rename-tag.js.es6 create mode 100644 app/assets/javascripts/discourse/controllers/tags-index.js.es6 create mode 100644 app/assets/javascripts/discourse/controllers/tags-show.js.es6 create mode 100644 app/assets/javascripts/discourse/helpers/discouse-tag.js.es6 create mode 100644 app/assets/javascripts/discourse/lib/category-tag-search.js.es6 create mode 100644 app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 create mode 100644 app/assets/javascripts/discourse/lib/render-tag.js.es6 create mode 100644 app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 create mode 100644 app/assets/javascripts/discourse/routes/tags-index.js.es6 create mode 100644 app/assets/javascripts/discourse/routes/tags-show.js.es6 create mode 100644 app/assets/javascripts/discourse/templates/bulk-tag.hbs create mode 100644 app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs create mode 100644 app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs create mode 100644 app/assets/javascripts/discourse/templates/components/tag-drop.hbs create mode 100644 app/assets/javascripts/discourse/templates/rename-tag.hbs create mode 100644 app/assets/javascripts/discourse/templates/tags.hbs create mode 100644 app/assets/javascripts/discourse/templates/tags/index.hbs create mode 100644 app/assets/javascripts/discourse/templates/tags/show.hbs create mode 100644 app/assets/javascripts/discourse/views/rename-tag.js.es6 create mode 100644 app/assets/javascripts/discourse/views/tags-show.js.es6 create mode 100644 app/assets/stylesheets/common/base/tagging.scss create mode 100644 app/controllers/tags_controller.rb create mode 100644 lib/discourse_tagging.rb diff --git a/.gitignore b/.gitignore index 95d44c86f8..fcdaca12ca 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,6 @@ # or operating system, you probably want to add a global ignore instead: # git config --global core.excludesfile ~/.gitignore_global -tags - .DS_Store ._.DS_Store dump.rdb diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js index f791de454c..1aa7fe9246 100644 --- a/app/assets/javascripts/discourse.js +++ b/app/assets/javascripts/discourse.js @@ -11,6 +11,7 @@ var _pluginCallbacks = []; window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, { rootElement: '#main', _docTitle: document.title, + __TAGS_INCLUDED__: true, getURL: function(url) { if (!url) return url; diff --git a/app/assets/javascripts/discourse/adapters/tag-notification.js.es6 b/app/assets/javascripts/discourse/adapters/tag-notification.js.es6 new file mode 100644 index 0000000000..7df07c2b39 --- /dev/null +++ b/app/assets/javascripts/discourse/adapters/tag-notification.js.es6 @@ -0,0 +1,7 @@ +import RESTAdapter from 'discourse/adapters/rest'; + +export default RESTAdapter.extend({ + pathFor(store, type, id) { + return "/tags/" + id + "/notifications"; + } +}); diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6 index 816a7e37de..89a45660d5 100644 --- a/app/assets/javascripts/discourse/components/composer-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6 @@ -2,6 +2,7 @@ import userSearch from 'discourse/lib/user-search'; import { default as computed, on } from 'ember-addons/ember-computed-decorators'; import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions'; import { linkSeenCategoryHashtags, fetchUnseenCategoryHashtags } from 'discourse/lib/link-category-hashtags'; +import { fetchUnseenTagHashtags, linkSeenTagHashtags } from 'discourse/lib/link-tag-hashtag'; export default Ember.Component.extend({ classNames: ['wmd-controls'], @@ -27,6 +28,22 @@ export default Ember.Component.extend({ return showPreview ? I18n.t('composer.hide_preview') : I18n.t('composer.show_preview'); }, + _renderUnseenTagHashtags($preview, unseen) { + fetchUnseenTagHashtags(unseen).then(() => { + linkSeenTagHashtags($preview); + }); + }, + + @on('previewRefreshed') + paintTagHashtags($preview) { + if (!this.siteSettings.tagging_enabled) { return; } + + const unseenTagHashtags = linkSeenTagHashtags($preview); + if (unseenTagHashtags.length) { + Ember.run.debounce(this, this._renderUnseenTagHashtags, $preview, unseenTagHashtags, 500); + } + }, + @computed markdownOptions() { return { diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 47c6c068d0..26521ca4d9 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -3,9 +3,10 @@ import loadScript from 'discourse/lib/load-script'; import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators'; import { showSelector } from "discourse/lib/emoji/emoji-toolbar"; import Category from 'discourse/models/category'; -import { SEPARATOR as categoryHashtagSeparator, - categoryHashtagTriggerRule - } from 'discourse/lib/category-hashtags'; +import { categoryHashtagTriggerRule } from 'discourse/lib/category-hashtags'; +import { TAG_HASHTAG_POSTFIX } from 'discourse/lib/tag-hashtags'; +import { search as searchCategoryTag } from 'discourse/lib/category-tag-search'; +import { SEPARATOR } from 'discourse/lib/category-hashtags'; // Our head can be a static string or a function that returns a string // based on input (like for numbered lists). @@ -278,17 +279,22 @@ export default Ember.Component.extend({ Ember.run.debounce(this, this._updatePreview, 30); }, - _applyCategoryHashtagAutocomplete(container, $editorInput) { - const template = container.lookup('template:category-group-autocomplete.raw'); + _applyCategoryHashtagAutocomplete(container) { + const template = container.lookup('template:category-tag-autocomplete.raw'); + const siteSettings = this.siteSettings; - $editorInput.autocomplete({ + this.$('.d-editor-input').autocomplete({ template: template, key: '#', - transformComplete(category) { - return Category.slugFor(category, categoryHashtagSeparator); + transformComplete(obj) { + if (obj.model) { + return Category.slugFor(obj.model, SEPARATOR); + } else { + return `${obj.text}${TAG_HASHTAG_POSTFIX}`; + } }, dataSource(term) { - return Category.search(term); + return searchCategoryTag(term, siteSettings); }, triggerRule(textarea, opts) { return categoryHashtagTriggerRule(textarea, opts); diff --git a/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 b/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 new file mode 100644 index 0000000000..08f0143256 --- /dev/null +++ b/app/assets/javascripts/discourse/components/discourse-tag-bound.js.es6 @@ -0,0 +1,13 @@ +export default Ember.Component.extend({ + tagName: 'a', + classNameBindings: [':discourse-tag', 'style', 'tagClass'], + attributeBindings: ['href'], + + tagClass: function() { + return "tag-" + this.get('tagRecord.id'); + }.property('tagRecord.id'), + + href: function() { + return '/tags/' + this.get('tagRecord.id'); + }.property('tagRecord.id'), +}); diff --git a/app/assets/javascripts/discourse/components/tag-chooser.js.es6 b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 new file mode 100644 index 0000000000..c942cf5993 --- /dev/null +++ b/app/assets/javascripts/discourse/components/tag-chooser.js.es6 @@ -0,0 +1,97 @@ +import renderTag from 'discourse/lib/render-tag'; + +function formatTag(t) { + return renderTag(t.id, {count: t.count}); +} + +export default Ember.TextField.extend({ + classNameBindings: [':tag-chooser'], + attributeBindings: ['tabIndex'], + + _setupTags: function() { + const tags = this.get('tags') || []; + this.set('value', tags.join(", ")); + }.on('init'), + + _valueChanged: function() { + const tags = this.get('value').split(',').map(v => v.trim()).reject(v => v.length === 0).uniq(); + this.set('tags', tags); + }.observes('value'), + + _initializeTags: function() { + const site = this.site, + self = this, + filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"); + + this.$().select2({ + tags: true, + placeholder: I18n.t('tagging.choose_for_topic'), + maximumInputLength: this.siteSettings.max_tag_length, + maximumSelectionSize: this.siteSettings.max_tags_per_topic, + initSelection(element, callback) { + const data = []; + + function splitVal(string, separator) { + var val, i, l; + if (string === null || string.length < 1) return []; + val = string.split(separator); + for (i = 0, l = val.length; i < l; i = i + 1) val[i] = $.trim(val[i]); + return val; + } + + $(splitVal(element.val(), ",")).each(function () { + data.push({ + id: this, + text: this + }); + }); + + callback(data); + }, + createSearchChoice: function(term, data) { + term = term.replace(filterRegexp, '').trim(); + + // No empty terms, make sure the user has permission to create the tag + if (!term.length || !site.get('can_create_tag')) { return; } + + if ($(data).filter(function() { + return this.text.localeCompare(term) === 0; + }).length === 0) { + return { id: term, text: term }; + } + }, + createSearchChoicePosition: function(list, item) { + // Search term goes on the bottom + list.push(item); + }, + formatSelection: function (data) { + return data ? renderTag(this.text(data)) : undefined; + }, + formatSelectionCssClass: function(){ + return "discourse-tag-select2"; + }, + formatResult: formatTag, + multiple: true, + ajax: { + quietMillis: 200, + cache: true, + url: Discourse.getURL("/tags/filter/search"), + dataType: 'json', + data: function (term) { + return { q: term, limit: self.siteSettings.max_tag_search_results }; + }, + results: function (data) { + if (self.siteSettings.tags_sort_alphabetically) { + data.results = data.results.sort(function(a,b) { return a.id > b.id; }); + } + return data; + } + }, + }); + }.on('didInsertElement'), + + _destroyTags: function() { + this.$().select2('destroy'); + }.on('willDestroyElement') + +}); diff --git a/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 new file mode 100644 index 0000000000..8cfad3cd2a --- /dev/null +++ b/app/assets/javascripts/discourse/components/tag-drop-link.js.es6 @@ -0,0 +1,29 @@ +import DiscourseURL from 'discourse/lib/url'; + +export default Ember.Component.extend({ + tagName: 'a', + classNameBindings: [':tag-badge-wrapper', ':badge-wrapper', ':bullet', 'tagClass'], + attributeBindings: ['href'], + + href: function() { + var url = '/tags'; + if (this.get('category')) { + url += this.get('category.url'); + } + return url + '/' + this.get('tagId'); + }.property('tagId', 'category'), + + tagClass: function() { + return "tag-" + this.get('tagId'); + }.property('tagId'), + + render(buffer) { + buffer.push(Handlebars.Utils.escapeExpression(this.get('tagId'))); + }, + + click(e) { + e.preventDefault(); + DiscourseURL.routeTo(this.get('href')); + return true; + } +}); diff --git a/app/assets/javascripts/discourse/components/tag-drop.js.es6 b/app/assets/javascripts/discourse/components/tag-drop.js.es6 new file mode 100644 index 0000000000..23e48091b1 --- /dev/null +++ b/app/assets/javascripts/discourse/components/tag-drop.js.es6 @@ -0,0 +1,113 @@ +import { setting } from 'discourse/lib/computed'; + +export default Ember.Component.extend({ + classNameBindings: [':tag-drop', 'tag::no-category', 'tags:has-drop','categoryStyle','tagClass'], + categoryStyle: setting('category_style'), // match the category-drop style + currentCategory: Em.computed.or('secondCategory', 'firstCategory'), + showFilterByTag: setting('show_filter_by_tag'), + showTagDropdown: Em.computed.and('showFilterByTag', 'tags'), + tagId: null, + + tagName: 'li', + + tags: function() { + if (this.siteSettings.tags_sort_alphabetically && Discourse.Site.currentProp('top_tags')) { + return Discourse.Site.currentProp('top_tags').sort(); + } else { + return Discourse.Site.currentProp('top_tags'); + } + }.property('site.top_tags'), + + iconClass: function() { + if (this.get('expanded')) { return "fa fa-caret-down"; } + return "fa fa-caret-right"; + }.property('expanded'), + + tagClass: function() { + if (this.get('tagId')) { + return "tag-" + this.get('tagId'); + } else { + return "tag_all"; + } + }.property('tagId'), + + allTagsUrl: function() { + if (this.get('currentCategory')) { + return this.get('currentCategory.url') + "?allTags=1"; + } else { + return "/"; + } + }.property('firstCategory', 'secondCategory'), + + allTagsLabel: function() { + return I18n.t("tagging.selector_all_tags"); + }.property('tag'), + + dropdownButtonClass: function() { + var result = 'badge-category category-dropdown-button'; + if (Em.isNone(this.get('tag'))) { + result += ' home'; + } + return result; + }.property('tag'), + + clickEventName: function() { + return "click.tag-drop-" + (this.get('tag') || "all"); + }.property('tag'), + + actions: { + expand: function() { + var self = this; + + if(!this.get('renderTags')){ + this.set('renderTags',true); + Em.run.next(function(){ + self.send('expand'); + }); + return; + } + + if (this.get('expanded')) { + this.close(); + return; + } + + if (this.get('tags')) { + this.set('expanded', true); + } + var $dropdown = this.$()[0]; + + this.$('a[data-drop-close]').on('click.tag-drop', function() { + self.close(); + }); + + Em.run.next(function(){ + self.$('.cat a').add('html').on(self.get('clickEventName'), function(e) { + var $target = $(e.target), + closest = $target.closest($dropdown); + + if ($(e.currentTarget).hasClass('badge-wrapper')){ + self.close(); + } + + return ($(e.currentTarget).hasClass('badge-category') || (closest.length && closest[0] === $dropdown)) ? true : self.close(); + }); + }); + } + }, + + removeEvents: function(){ + $('html').off(this.get('clickEventName')); + this.$('a[data-drop-close]').off('click.tag-drop'); + }, + + close: function() { + this.removeEvents(); + this.set('expanded', false); + }, + + willDestroyElement: function() { + this.removeEvents(); + } + +}); diff --git a/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6 new file mode 100644 index 0000000000..b4588df710 --- /dev/null +++ b/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6 @@ -0,0 +1,11 @@ +import NotificationsButton from 'discourse/components/notifications-button'; + +export default NotificationsButton.extend({ + classNames: ['notification-options', 'tag-notification-menu'], + buttonIncludesText: false, + i18nPrefix: 'tagging.notifications', + + clicked(id) { + this.sendAction('action', id); + } +}); diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index b94ca33476..b22330abba 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -81,6 +81,14 @@ export default Ember.Controller.extend({ this.set('similarTopics', []); }.on('init'), + @computed('model.canEditTitle', 'model.creatingPrivateMessage') + canEditTags(canEditTitle, creatingPrivateMessage) { + return !this.site.mobileView && + this.site.get('can_tag_topics') && + canEditTitle && + !creatingPrivateMessage; + }, + @computed('model.action') canWhisper(action) { const currentUser = this.currentUser; diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6 index 52d0d1de8c..973ff24a45 100644 --- a/app/assets/javascripts/discourse/controllers/history.js.es6 +++ b/app/assets/javascripts/discourse/controllers/history.js.es6 @@ -3,6 +3,15 @@ import { categoryBadgeHTML } from 'discourse/helpers/category-link'; import computed from 'ember-addons/ember-computed-decorators'; import { propertyGreaterThan, propertyLessThan } from 'discourse/lib/computed'; +function customTagArray(fieldName) { + return function() { + var val = this.get(fieldName); + if (!val) { return val; } + if (!Array.isArray(val)) { val = [val]; } + return val; + }.property(fieldName); +} + // This controller handles displaying of history export default Ember.Controller.extend(ModalFunctionality, { loading: true, @@ -13,6 +22,9 @@ export default Ember.Controller.extend(ModalFunctionality, { if (this.site.mobileView) { this.set("viewMode", "inline"); } }.on("init"), + previousTagChanges: customTagArray('model.tags_changes.previous'), + currentTagChanges: customTagArray('model.tags_changes.current'), + refresh(postId, postVersion) { this.set("loading", true); diff --git a/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 new file mode 100644 index 0000000000..3c5a7bc292 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/rename-tag.js.es6 @@ -0,0 +1,25 @@ +import ModalFunctionality from 'discourse/mixins/modal-functionality'; +import BufferedContent from 'discourse/mixins/buffered-content'; + +export default Ember.Controller.extend(ModalFunctionality, BufferedContent, { + + renameDisabled: function() { + const filterRegexp = new RegExp(this.site.tags_filter_regexp, "g"), + newId = this.get('buffered.id').replace(filterRegexp, '').trim(); + + return (newId.length === 0) || (newId === this.get('model.id')); + }.property('buffered.id', 'id'), + + actions: { + performRename() { + const tag = this.get('model'), + self = this; + tag.update({ id: this.get('buffered.id') }).then(function() { + self.send('closeModal'); + self.transitionToRoute('tags.show', tag.get('id')); + }).catch(function() { + self.flash(I18n.t('generic_error'), 'error'); + }); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js.es6 new file mode 100644 index 0000000000..e2a49fee20 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/tags-index.js.es6 @@ -0,0 +1,15 @@ +export default Ember.Controller.extend({ + sortProperties: ['count:desc', 'id'], + + sortedTags: Ember.computed.sort('model', 'sortProperties'), + + actions: { + sortByCount() { + this.set('sortProperties', ['count:desc', 'id']); + }, + + sortById() { + this.set('sortProperties', ['id']); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/tags-show.js.es6 b/app/assets/javascripts/discourse/controllers/tags-show.js.es6 new file mode 100644 index 0000000000..34c4729228 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/tags-show.js.es6 @@ -0,0 +1,133 @@ +import BulkTopicSelection from "discourse/mixins/bulk-topic-selection"; +import { default as NavItem, extraNavItemProperties, customNavItemHref } from 'discourse/models/nav-item'; + +if (extraNavItemProperties) { + extraNavItemProperties(function(text, opts) { + if (opts && opts.tagId) { + return {tagId: opts.tagId}; + } else { + return {}; + } + }); +} + +if (customNavItemHref) { + customNavItemHref(function(navItem) { + if (navItem.get('tagId')) { + var name = navItem.get('name'); + + if ( !Discourse.Site.currentProp('filters').contains(name) ) { + return null; + } + + var path = "/tags/", + category = navItem.get("category"); + + if(category){ + path += "c/"; + path += Discourse.Category.slugFor(category); + if (navItem.get('noSubcategories')) { path += '/none'; } + path += "/"; + } + + path += navItem.get('tagId') + "/l/"; + return path + name.replace(' ', '-'); + } else { + return null; + } + }); +} + + +export default Ember.Controller.extend(BulkTopicSelection, { + needs: ["application"], + + tag: null, + list: null, + canAdminTag: Ember.computed.alias("currentUser.staff"), + filterMode: null, + navMode: 'latest', + loading: false, + canCreateTopic: false, + order: 'default', + ascending: false, + status: null, + state: null, + search: null, + max_posts: null, + q: null, + + queryParams: ['order', 'ascending', 'status', 'state', 'search', 'max_posts', 'q'], + + navItems: function() { + return NavItem.buildList(this.get('category'), {tagId: this.get('tag.id'), filterMode: this.get('filterMode')}); + }.property('category', 'tag.id', 'filterMode'), + + showTagFilter: function() { + return Discourse.SiteSettings.show_filter_by_tag; + }.property('category'), + + categories: function() { + return Discourse.Category.list(); + }.property(), + + showAdminControls: function() { + return this.get('canAdminTag') && !this.get('category'); + }.property('canAdminTag', 'category'), + + loadMoreTopics() { + return this.get("list").loadMore(); + }, + + _showFooter: function() { + this.set("controllers.application.showFooter", !this.get("list.canLoadMore")); + }.observes("list.canLoadMore"), + + footerMessage: function() { + if (this.get('loading') || this.get('list.topics.length') !== 0) { return; } + + if (this.get('list.topics.length') === 0) { + return I18n.t('tagging.topics.none.' + this.get('navMode'), {tag: this.get('tag.id')}); + } else { + return I18n.t('tagging.topics.bottom.' + this.get('navMode'), {tag: this.get('tag.id')}); + } + }.property('navMode', 'list.topics.length', 'loading'), + + actions: { + changeSort(sortBy) { + if (sortBy === this.get('order')) { + this.toggleProperty('ascending'); + } else { + this.setProperties({ order: sortBy, ascending: false }); + } + this.send('invalidateModel'); + }, + + refresh() { + const self = this; + // TODO: this probably doesn't work anymore + return this.store.findFiltered('topicList', {filter: 'tags/' + this.get('tag.id')}).then(function(list) { + self.set("list", list); + self.resetSelected(); + }); + }, + + deleteTag() { + const self = this; + bootbox.confirm(I18n.t("tagging.delete_confirm"), function(result) { + if (!result) { return; } + + self.get("tag").destroyRecord().then(function() { + self.transitionToRoute("tags.index"); + }).catch(function() { + bootbox.alert(I18n.t("generic_error")); + }); + }); + }, + + changeTagNotification(id) { + const tagNotification = this.get("tagNotification"); + tagNotification.update({ notification_level: id }); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 index 2dd79219e5..89a6b0e70a 100644 --- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 @@ -14,11 +14,15 @@ addBulkButton('archiveTopics', 'archive_topics'); addBulkButton('showNotificationLevel', 'notification_level'); addBulkButton('resetRead', 'reset_read'); addBulkButton('unlistTopics', 'unlist_topics'); +addBulkButton('showTagTopics', 'change_tags'); // Modal for performing bulk actions on topics export default Ember.ArrayController.extend(ModalFunctionality, { + tags: null, buttonRows: null, + emptyTags: Ember.computed.empty('tags'), + onShow() { this.set('controllers.modal.modalClass', 'topic-bulk-actions-modal small'); @@ -73,6 +77,15 @@ export default Ember.ArrayController.extend(ModalFunctionality, { }, actions: { + showTagTopics() { + this.set('tags', ''); + this.send('changeBulkTemplate', 'bulk-tag'); + }, + + changeTags() { + this.performAndRefresh({type: 'change_tags', tags: this.get('tags')}); + }, + showChangeCategory() { this.send('changeBulkTemplate', 'modal/bulk_change_category'); this.set('controllers.modal.modalClass', 'topic-bulk-actions-modal full'); diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index da342c73a1..3607e1d9f4 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -108,6 +108,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { return post => this.postSelected(post); }.property(), + @computed('model.isPrivateMessage') + canEditTags(isPrivateMessage) { + return !isPrivateMessage && this.site.get('can_tag_topics'); + }, + actions: { fillGapBefore(args) { diff --git a/app/assets/javascripts/discourse/helpers/discouse-tag.js.es6 b/app/assets/javascripts/discourse/helpers/discouse-tag.js.es6 new file mode 100644 index 0000000000..b6d9d35524 --- /dev/null +++ b/app/assets/javascripts/discourse/helpers/discouse-tag.js.es6 @@ -0,0 +1,6 @@ +import registerUnbound from 'discourse/helpers/register-unbound'; +import renderTag from 'discourse/lib/render-tag'; + +export default registerUnbound('discourse-tag', function(name, params) { + return new Handlebars.SafeString(renderTag(name, params)); +}); diff --git a/app/assets/javascripts/discourse/lib/category-tag-search.js.es6 b/app/assets/javascripts/discourse/lib/category-tag-search.js.es6 new file mode 100644 index 0000000000..d7895ff47a --- /dev/null +++ b/app/assets/javascripts/discourse/lib/category-tag-search.js.es6 @@ -0,0 +1,65 @@ +import { CANCELLED_STATUS } from 'discourse/lib/autocomplete'; +import Category from 'discourse/models/category'; + +var cache = {}; +var cacheTime; +var oldSearch; + +function updateCache(term, results) { + cache[term] = results; + cacheTime = new Date(); + return results; +} + +function searchTags(term, categories, limit) { + return new Ember.RSVP.Promise((resolve) => { + const clearPromise = setTimeout(() => { + resolve(CANCELLED_STATUS); + }, 5000); + + const debouncedSearch = _.debounce((q, cats, resultFunc) => { + oldSearch = $.ajax(Discourse.getURL("/tags/filter/search"), { + type: 'GET', + cache: true, + data: { limit: limit, q } + }); + + var returnVal = CANCELLED_STATUS; + + oldSearch.then((r) => { + var tags = r.results.map((tag) => { return { text: tag.text, count: tag.count }; }); + returnVal = cats.concat(tags); + }).always(() => { + oldSearch = null; + resultFunc(returnVal); + }); + }, 300); + + debouncedSearch(term, categories, (result) => { + clearTimeout(clearPromise); + resolve(updateCache(term, result)); + }); + }); +}; + +export function search(term, siteSettings) { + if (oldSearch) { + oldSearch.abort(); + oldSearch = null; + } + + if ((new Date() - cacheTime) > 30000) cache = {}; + const cached = cache[term]; + if (cached) return cached; + + const limit = 5; + var categories = Category.search(term, { limit }); + var numOfCategories = categories.length; + categories = categories.map((category) => { return { model: category }; }); + + if (numOfCategories !== limit && siteSettings.tagging_enabled) { + return searchTags(term, categories, limit - numOfCategories); + } else { + return updateCache(term, categories); + } +}; diff --git a/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 new file mode 100644 index 0000000000..c37610ff03 --- /dev/null +++ b/app/assets/javascripts/discourse/lib/link-tag-hashtag.js.es6 @@ -0,0 +1,52 @@ +import { replaceSpan } from 'discourse/lib/category-hashtags'; +import { TAG_HASHTAG_POSTFIX } from 'discourse/lib/tag-hashtags'; + +const validTagHashtags = {}; +const checkedTagHashtags = []; +const testedClass = 'tag-hashtag-tested'; + +function updateFound($hashtags, tagValues) { + Ember.run.schedule('afterRender', () => { + $hashtags.each((index, hashtag) => { + const tagValue = tagValues[index]; + const link = validTagHashtags[tagValue]; + const $hashtag = $(hashtag); + + if (link) { + replaceSpan($hashtag, tagValue, link); + } else if (checkedTagHashtags.indexOf(tagValue) !== -1) { + $hashtag.addClass(testedClass); + } + }); + }); +} + +export function linkSeenTagHashtags($elem) { + const $hashtags = $(`span.hashtag:not(.${testedClass})`, $elem); + const unseen = []; + + if ($hashtags.length) { + const tagValues = $hashtags.map((_, hashtag) => { + return $(hashtag).text().substr(1).replace(`${TAG_HASHTAG_POSTFIX}`, ""); + }); + + if (tagValues.length) { + _.uniq(tagValues).forEach((tagValue) => { + if (checkedTagHashtags.indexOf(tagValue) === -1) unseen.push(tagValue); + }); + } + updateFound($hashtags, tagValues); + } + + return unseen; +}; + +export function fetchUnseenTagHashtags(tagValues) { + return Discourse.ajax("/tags/check", { data: { tag_values: tagValues } }) + .then((response) => { + response.valid.forEach((tag) => { + validTagHashtags[tag.value] = tag.url; + }); + checkedTagHashtags.push.apply(checkedTagHashtags, tagValues); + }); +} diff --git a/app/assets/javascripts/discourse/lib/render-tag.js.es6 b/app/assets/javascripts/discourse/lib/render-tag.js.es6 new file mode 100644 index 0000000000..5b62798541 --- /dev/null +++ b/app/assets/javascripts/discourse/lib/render-tag.js.es6 @@ -0,0 +1,37 @@ +import { h } from 'virtual-dom'; + +export default function renderTag(tag, params) { + params = params || {}; + tag = Handlebars.Utils.escapeExpression(tag); + const classes = ['tag-' + tag, 'discourse-tag']; + const tagName = params.tagName || "a"; + const href = tagName === "a" ? " href='" + Discourse.getURL("/tags/" + tag) + "' " : ""; + + if (Discourse.SiteSettings.tag_style || params.style) { + classes.push(params.style || Discourse.SiteSettings.tag_style); + } + + let val = "<" + tagName + href + " class='" + classes.join(" ") + "'>" + tag + ""; + + if (params.count) { + val += " x" + params.count + ""; + } + + return val; +}; + +export function tagNode(tag, params) { + const classes = ['tag-' + tag, 'discourse-tag']; + const tagName = params.tagName || "a"; + + if (Discourse.SiteSettings.tag_style || params.style) { + classes.push(params.style || Discourse.SiteSettings.tag_style); + } + + if (tagName === 'a') { + const href = Discourse.getURL(`/tags/${tag}`); + return h(tagName, { className: classes.join(' '), attributes: { href } }, tag); + } else { + return h(tagName, { className: classes.join(' ') }, tag); + } +} diff --git a/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 b/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 new file mode 100644 index 0000000000..13eb406545 --- /dev/null +++ b/app/assets/javascripts/discourse/lib/tag-hashtags.js.es6 @@ -0,0 +1 @@ +export const TAG_HASHTAG_POSTFIX = '::tag'; diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 9107fe62f1..af4c9c41ae 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -28,12 +28,14 @@ const CLOSED = 'closed', archetype: 'archetypeId', target_usernames: 'targetUsernames', typing_duration_msecs: 'typingTime', - composer_open_duration_msecs: 'composerTime' + composer_open_duration_msecs: 'composerTime', + tags: 'tags' }, _edit_topic_serializer = { title: 'topic.title', - categoryId: 'topic.category.id' + categoryId: 'topic.category.id', + tags: 'topic.tags' }; const Composer = RestModel.extend({ diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index e6cd21304d..888f09838c 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -72,6 +72,24 @@ const Topic = RestModel.extend({ return this.store.createRecord('postStream', {id: this.get('id'), topic: this}); }.property(), + @computed('tags') + visibleListTags(tags) { + if (!tags || !Discourse.SiteSettings.suppress_overlapping_tags_in_list) { + return tags; + } + + const title = this.get('title'); + const newTags = []; + + tags.forEach(function(tag){ + if (title.toLowerCase().indexOf(tag) === -1 || Discourse.SiteSettings.staff_tags.indexOf(tag) !== -1) { + newTags.push(tag); + } + }); + + return newTags; + }, + replyCount: function() { return this.get('posts_count') - 1; }.property('posts_count'), diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 index f8c278db19..adc3436d9b 100644 --- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 +++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 @@ -118,4 +118,16 @@ export default function() { this.resource('queued-posts', { path: '/queued-posts' }); this.route('full-page-search', {path: '/search'}); + + this.resource('tags', function() { + this.route('show', {path: '/:tag_id'}); + this.route('showCategory', {path: '/c/:category/:tag_id'}); + this.route('showParentCategory', {path: '/c/:parent_category/:category/:tag_id'}); + + Discourse.Site.currentProp('filters').forEach(filter => { + this.route('show' + filter.capitalize(), {path: '/:tag_id/l/' + filter}); + this.route('showCategory' + filter.capitalize(), {path: '/c/:category/:tag_id/l/' + filter}); + this.route('showParentCategory' + filter.capitalize(), {path: '/c/:parent_category/:category/:tag_id/l/' + filter}); + }); + }); } diff --git a/app/assets/javascripts/discourse/routes/tags-index.js.es6 b/app/assets/javascripts/discourse/routes/tags-index.js.es6 new file mode 100644 index 0000000000..4becf99d57 --- /dev/null +++ b/app/assets/javascripts/discourse/routes/tags-index.js.es6 @@ -0,0 +1,12 @@ +export default Discourse.Route.extend({ + model() { + return this.store.findAll('tag'); + }, + + actions: { + didTransition() { + this.controllerFor("application").set("showFooter", true); + return true; + } + } +}); diff --git a/app/assets/javascripts/discourse/routes/tags-show.js.es6 b/app/assets/javascripts/discourse/routes/tags-show.js.es6 new file mode 100644 index 0000000000..ea8762745b --- /dev/null +++ b/app/assets/javascripts/discourse/routes/tags-show.js.es6 @@ -0,0 +1,137 @@ +import Composer from 'discourse/models/composer'; +import showModal from "discourse/lib/show-modal"; +import { findTopicList } from 'discourse/routes/build-topic-route'; + +export default Discourse.Route.extend({ + navMode: 'latest', + + renderTemplate() { + const controller = this.controllerFor('tags.show'); + this.render('tags.show', { controller }); + }, + + model(params) { + var tag = this.store.createRecord("tag", { id: Handlebars.Utils.escapeExpression(params.tag_id) }), + f = ''; + + if (params.category) { + f = 'c/'; + if (params.parent_category) { f += params.parent_category + '/'; } + f += params.category + '/l/'; + } + f += this.get('navMode'); + this.set('filterMode', f); + + if (params.category) { this.set('categorySlug', params.category); } + if (params.parent_category) { this.set('parentCategorySlug', params.parent_category); } + + if (this.get("currentUser")) { + // If logged in, we should get the tag"s user settings + return this.store.find("tagNotification", tag.get("id")).then(tn => { + this.set("tagNotification", tn); + return tag; + }); + } + + return tag; + }, + + afterModel(tag) { + const controller = this.controllerFor('tags.show'); + controller.set('loading', true); + + const params = controller.getProperties('order', 'ascending'); + + const categorySlug = this.get('categorySlug'); + const parentCategorySlug = this.get('parentCategorySlug'); + const filter = this.get('navMode'); + + if (categorySlug) { + var category = Discourse.Category.findBySlug(categorySlug, parentCategorySlug); + if (parentCategorySlug) { + params.filter = `tags/c/${parentCategorySlug}/${categorySlug}/${tag.id}/l/${filter}`; + } else { + params.filter = `tags/c/${categorySlug}/${tag.id}/l/${filter}`; + } + + this.set('category', category); + } else { + params.filter = `tags/${tag.id}/l/${filter}`; + this.set('category', null); + } + + return findTopicList(this.store, this.topicTrackingState, params.filter, params, {}).then(function(list) { + controller.set('list', list); + controller.set('canCreateTopic', list.get('can_create_topic')); + if (list.topic_list.tags) { + Discourse.Site.currentProp('top_tags', list.topic_list.tags); + } + controller.set('loading', false); + }); + }, + + titleToken() { + const filterText = I18n.t('filters.' + this.get('navMode').replace('/', '.') + '.title'), + controller = this.controllerFor('tags.show'); + + if (this.get('category')) { + return I18n.t('tagging.filters.with_category', { filter: filterText, tag: controller.get('model.id'), category: this.get('category.name')}); + } else { + return I18n.t('tagging.filters.without_category', { filter: filterText, tag: controller.get('model.id')}); + } + }, + + setupController(controller, model) { + this.controllerFor('tags.show').setProperties({ + model, + tag: model, + category: this.get('category'), + filterMode: this.get('filterMode'), + navMode: this.get('navMode'), + tagNotification: this.get('tagNotification') + }); + }, + + actions: { + invalidateModel() { + this.refresh(); + }, + + renameTag(tag) { + showModal("rename-tag", { model: tag }); + }, + + createTopic() { + var controller = this.controllerFor("tags.show"), + self = this; + + this.controllerFor('composer').open({ + categoryId: controller.get('category.id'), + action: Composer.CREATE_TOPIC, + draftKey: controller.get('list.draft_key'), + draftSequence: controller.get('list.draft_sequence') + }).then(function() { + // Pre-fill the tags input field + if (controller.get('model.id')) { + var c = self.controllerFor('composer').get('model'); + c.set('tags', [controller.get('model.id')]); + } + }); + }, + + didTransition() { + this.controllerFor("tags.show")._showFooter(); + return true; + }, + + willTransition(transition) { + if (!Discourse.SiteSettings.show_filter_by_tag) { return true; } + + if ((transition.targetName.indexOf("discovery.parentCategory") !== -1 || + transition.targetName.indexOf("discovery.category") !== -1) && !transition.queryParams.allTags ) { + this.transitionTo("/tags" + transition.intent.url + "/" + this.currentModel.get("id")); + } + return true; + } + } +}); diff --git a/app/assets/javascripts/discourse/templates/bulk-tag.hbs b/app/assets/javascripts/discourse/templates/bulk-tag.hbs new file mode 100644 index 0000000000..1ffe345e30 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/bulk-tag.hbs @@ -0,0 +1,5 @@ +

      {{i18n "topics.bulk.choose_new_tags"}}

      + +

      {{tag-chooser tags=tags}}

      + +{{d-button action="changeTags" disabled=emptyTags label="topics.bulk.change_tags"}} diff --git a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs new file mode 100644 index 0000000000..886c7bba73 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs @@ -0,0 +1,13 @@ +
      + +
      diff --git a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs index 756b976c33..f737c96976 100644 --- a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs +++ b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs @@ -4,6 +4,10 @@ {{category-drop category=secondCategory parentCategory=firstCategory categories=childCategories subCategory="true" noSubcategories=noSubcategories}} {{/if}} +{{#if siteSettings.tagging_enabled}} + {{tag-drop firstCategory=firstCategory secondCategory=secondCategory tagId=tagId}} +{{/if}} + {{plugin-outlet "bread-crumbs-right" tagName="li"}}
      diff --git a/app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs b/app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs new file mode 100644 index 0000000000..d7eb83adb9 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/discourse-tag-bound.hbs @@ -0,0 +1 @@ +{{tagRecord.id}} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/templates/components/tag-drop.hbs b/app/assets/javascripts/discourse/templates/components/tag-drop.hbs new file mode 100644 index 0000000000..46e4f66046 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/tag-drop.hbs @@ -0,0 +1,21 @@ +{{#if showTagDropdown}} + {{#if tagId}} + {{tagId}} + {{else}} + {{allTagsLabel}} + {{/if}} + + {{#if tags}} + +
      +
      {{allTagsLabel}}
      + {{#if renderTags}} + {{#each t in tags}} +
      + {{tag-drop-link tagId=t category=currentCategory}} +
      + {{/each}} + {{/if}} +
      + {{/if}} +{{/if}} \ No newline at end of file diff --git a/app/assets/javascripts/discourse/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/templates/components/topic-category.hbs index 8a914440e0..cf70e3e8a8 100644 --- a/app/assets/javascripts/discourse/templates/components/topic-category.hbs +++ b/app/assets/javascripts/discourse/templates/components/topic-category.hbs @@ -2,5 +2,12 @@ {{bound-category-link topic.category.parentCategory}} {{/if}} {{bound-category-link topic.category hideParent=true}} +{{#if siteSettings.tagging_enabled}} +
      + {{#each t in topic.tags}} + {{discourse-tag t}} + {{/each}} +
      +{{/if}} {{plugin-outlet "topic-category"}} diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index 06ebfdfbef..1ecbecab16 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -97,6 +97,9 @@ {{#if currentUser}}
      {{plugin-outlet "composer-fields-below"}} + {{#if canEditTags}} + {{tag-chooser tags=model.tags tabIndex="4"}} + {{/if}} {{i18n 'cancel'}} diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs index e216f7ab3f..7c39f11aa5 100644 --- a/app/assets/javascripts/discourse/templates/full-page-search.hbs +++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs @@ -70,6 +70,9 @@
      {{category-link result.topic.category}} + {{#each result.topic.tags as |tag|}} + {{discourse-tag tag}} + {{/each}} {{plugin-outlet "full-page-search-category"}}
      diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs index 67b03cfbd3..6efca18268 100644 --- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs @@ -11,6 +11,13 @@ {{#if controller.showTopicPostBadges}} {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}} {{/if}} + {{#if topic.tags}} +
      + {{#each tag in topic.visibleListTags}} + {{discourse-tag tag}} + {{/each}} +
      + {{/if}} {{plugin-outlet "topic-list-tags"}} {{#if expandPinned}} {{raw "list/topic-excerpt" topic=topic}} diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs index 0c11907039..aff527a690 100644 --- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs @@ -27,6 +27,14 @@
    {{/unless}} + {{#if context.topic.tags}} +
    + {{#each tag in context.topic.visibleListTags}} + {{discourse-tag tag}} + {{/each}} +
    + {{/if}} + {{plugin-outlet "topic-list-tags"}}
    diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs index 21e1662758..72857dbf86 100644 --- a/app/assets/javascripts/discourse/templates/modal/history.hbs +++ b/app/assets/javascripts/discourse/templates/modal/history.hbs @@ -73,6 +73,19 @@
    {{/if}} {{/if}} + {{#if model.tags_changes}} +
    + {{i18n "tagging.changed"}} + {{#each previousTagChanges as |t|}} + {{discourse-tag t}} + {{/each}} + → +   + {{#each currentTagChanges as |t|}} + {{discourse-tag t}} + {{/each}} +
    + {{/if}} {{plugin-outlet "post-revisions"}} diff --git a/app/assets/javascripts/discourse/templates/rename-tag.hbs b/app/assets/javascripts/discourse/templates/rename-tag.hbs new file mode 100644 index 0000000000..0d69f7f65d --- /dev/null +++ b/app/assets/javascripts/discourse/templates/rename-tag.hbs @@ -0,0 +1,13 @@ +
    + +
    + +
    + {{d-button class="btn-primary" + action="performRename" + label="tagging.rename_tag" + disabled=renameDisabled}} +
    diff --git a/app/assets/javascripts/discourse/templates/tags.hbs b/app/assets/javascripts/discourse/templates/tags.hbs new file mode 100644 index 0000000000..3fd70a3f75 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/tags.hbs @@ -0,0 +1,9 @@ +
    +
    +
    +
    + {{outlet}} +
    +
    +
    +
    diff --git a/app/assets/javascripts/discourse/templates/tags/index.hbs b/app/assets/javascripts/discourse/templates/tags/index.hbs new file mode 100644 index 0000000000..e0d86aa194 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/tags/index.hbs @@ -0,0 +1,15 @@ +

    {{i18n "tagging.all_tags"}}

    + +
    + {{i18n "tagging.sort_by"}} + {{i18n "tagging.sort_by_count"}} + {{i18n "tagging.sort_by_name"}} +
    + +
    + {{#each tag in sortedTags}} +
    + {{discourse-tag tag.id}} x {{tag.count}} +
    + {{/each}} +
    diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs new file mode 100644 index 0000000000..757861c9b5 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/tags/show.hbs @@ -0,0 +1,58 @@ +
    +
    + {{#if tagNotification}} + {{tag-notifications-button action="changeTagNotification" + notificationLevel=tagNotification.notification_level}} + {{/if}} + + {{#if showAdminControls}} + {{d-button action="deleteTag" label="tagging.delete_tag" icon="trash-o" class="admin-tag btn-danger"}} + {{d-button action="renameTag" actionParam=tag label="tagging.rename_tag" icon="pencil" class="admin-tag"}} + {{else}} + {{#if canCreateTopic}} + + {{/if}} + {{/if}} + + {{#if showTagFilter}} + {{bread-crumbs categories=categories + category=category + tagId=tag.id + noSubcategories=noSubcategories + hideSubcategories=showingSubcategoryList}} + + {{navigation-bar navItems=navItems filterMode=filterMode}} + {{else}} +

    + {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}} + {{fa-icon "angle-right"}} + {{discourse-tag-bound tagRecord=tag style="simple"}} +

    + {{/if}} +
    +
    + +
    + {{conditional-loading-spinner condition=loading}} + + {{#unless loading}} + {{#if list.topics}} + {{bulk-select-button selected=selected refreshTarget=controller}} + + {{topic-list topics=list.topics + canBulkSelect=canBulkSelect + toggleBulkSelect="toggleBulkSelect" + bulkSelectEnabled=bulkSelectEnabled + selected=selected + showPosters=true + currentUser=currentUser + order=order + ascending=ascending + changeSort="changeSort"}} + {{else}} +

    + {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} +

    + {{/if}} + {{/unless}} +
    diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index ab5e84bcbf..6772028a3f 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -23,6 +23,10 @@ {{category-chooser valueAttribute="id" value=buffered.category_id source=buffered.category_id}} {{/if}} + {{#if canEditTags}} + {{tag-chooser tags=buffered.tags}} + {{/if}} + {{plugin-outlet "edit-topic"}} {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}} diff --git a/app/assets/javascripts/discourse/views/rename-tag.js.es6 b/app/assets/javascripts/discourse/views/rename-tag.js.es6 new file mode 100644 index 0000000000..68a0b12c5c --- /dev/null +++ b/app/assets/javascripts/discourse/views/rename-tag.js.es6 @@ -0,0 +1,5 @@ +import ModalBodyView from 'discourse/views/modal-body'; + +export default ModalBodyView.extend({ + title: I18n.t("tagging.rename_tag") +}); diff --git a/app/assets/javascripts/discourse/views/tags-show.js.es6 b/app/assets/javascripts/discourse/views/tags-show.js.es6 new file mode 100644 index 0000000000..384e1a857c --- /dev/null +++ b/app/assets/javascripts/discourse/views/tags-show.js.es6 @@ -0,0 +1,3 @@ +import DiscoveryTopicsView from "discourse/views/discovery-topics"; + +export default DiscoveryTopicsView; diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 index ca9a925b0f..53b3bc14f8 100644 --- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 @@ -83,6 +83,10 @@ export default createWidget('hamburger-menu', { links.push({ route: 'users', className: 'user-directory-link', label: 'directory.title' }); } + if (this.siteSettings.tagging_enabled) { + links.push({ route: 'tags', label: 'tagging.tags' }); + } + return links.map(l => this.attach('link', l)); }, diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 index 1b6b8a269e..3215bc8f71 100644 --- a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 @@ -3,6 +3,7 @@ import { h } from 'virtual-dom'; import { iconNode } from 'discourse/helpers/fa-icon'; import DiscourseURL from 'discourse/lib/url'; import RawHtml from 'discourse/widgets/raw-html'; +import { tagNode } from 'discourse/lib/render-tag'; export default createWidget('header-topic-info', { tagName: 'div.extra-info-wrapper', @@ -42,6 +43,13 @@ export default createWidget('header-topic-info', { } title.push(this.attach('category-link', { category })); } + + if (this.siteSettings.tagging_enabled) { + const tags = topic.get('tags') || []; + if (tags.length) { + title.push(h('div.list-tags', tags.map(tagNode))); + } + } } const contents = h('div.title-wrapper', title); diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss new file mode 100644 index 0000000000..40ee276863 --- /dev/null +++ b/app/assets/stylesheets/common/base/tagging.scss @@ -0,0 +1,192 @@ + +.topic-title-outlet.choose-tags { + margin-left: 25px; + margin-top: 3px; +} + +.tag-list { + margin-top: 2em; +} + +.tag-box { + display: inline-block; + width: 300px; + margin-bottom: 1em; + float: left; + + .discourse-tag { + font-size: 1em; + } + + .tag-count { + font-size: 0.9em; + } +} + +.extra-info-wrapper { + .list-tags { + padding-top: 5px; + } + + .discourse-tag { + -webkit-animation: fadein .7s; + animation: fadein .7s; + } +} + + +.add-tags .select2 { + margin: 0; +} + +$tag-color: scale-color($primary, $lightness: 40%); + +.discourse-tag-count { + font-size: 0.8em; + color: $tag-color; +} + +.select2-result-label .discourse-tag { + margin-right: 0; +} + + +.discourse-tag { + padding: 0; + margin: 0 5px 0 0; + color: $tag-color; + + &:visited, &:hover { + color: $tag-color; + } + + &.box { + background-color: scale-color($primary, $lightness: 90%); + color: scale-color($primary, $lightness: 30%); + padding: 2px 8px; + } + + &.simple, &.simple:visited, &.simple:hover { + margin-right: 0px; + color: scale-color($primary, $lightness: 30%); + } +} + +.discourse-tags, .list-tags { + .discourse-tag.simple:not(:last-child):after { + content: ", "; + margin-left: 1px; + } +} + +.select2-container-multi .select2-choices .select2-search-choice.discourse-tag-select2 { + padding-top: 5px; + -webkit-box-shadow: none; + box-shadow: none; + border: 0; + border-radius: 0; + background-color: transparent; +} + + +.fps-result .add-full-page-tags { + display: inline-block; +} + +.topic-list-item .discourse-tags { + display: block; + font-size: 0.75em; + font-weight: normal; + clear: both; + margin-top: 5px; + + .discourse-tag.box { + position:relative; + top: 2px; + } +} + +.mobile-view .topic-list-item .discourse-tags { + display: inline-block; + font-size: 0.9em; + margin-top: 0; + .discourse-tag.box { + position:relative; + top: 0; + } +} + + + +.discourse-tag.bullet:before { + content: "\f04d"; + font-family: FontAwesome; + color: scale-color($primary, $lightness: 70%); + margin-right: 5px; + font-size: 0.7em; + position:relative; + top: -0.1em; +} + +header .discourse-tag {color: $tag-color !important; } + +.list-tags { + display: inline; + margin: 0 0 0 5px; + font-size: 0.857em; +} + +.tag-chooser { + width: 100%; + margin: 5px 0; +} + +.admin-tag { + position: relative; + float: right; + margin-right: 8px; +} + +.tag-notification-menu { + float: right; + margin-bottom: 10px; +} + +.tag-notification-menu .dropdown-menu { + right: 0; + top: 30px; + bottom: auto; + left: auto; +} + +.bullet + .list-tags { + display: block; +} + +.bar + .list-tags { + line-height: 1.25; + .discourse-tag { + vertical-align: middle; + } +} + +.box + .list-tags { + display: inline-block; + margin: 5px 0 0 5px; + padding-top: 2px; +} + +.tag-sort-options a { + text-decoration: underline; +} + +.autocomplete { + .fa-tag { + color: dark-light-choose($primary, scale-color($primary, $lightness: 70%)); + padding-right: 5px; + } + + a { + color: $tag-color; + } +} diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb new file mode 100644 index 0000000000..0aecc1be9e --- /dev/null +++ b/app/controllers/tags_controller.rb @@ -0,0 +1,192 @@ +require_dependency 'topic_list_responder' +require_dependency 'topics_bulk_action' +require_dependency 'topic_query' + +class TagsController < ::ApplicationController + include TopicListResponder + + before_filter :ensure_tags_enabled + + skip_before_filter :check_xhr, only: [:tag_feed, :show] + before_filter :ensure_logged_in, only: [:notifications, :update_notifications, :update] + before_filter :set_category_from_params, except: [:index, :update, :destroy, :tag_feed, :search, :notifications, :update_notifications] + + def index + tag_counts = self.class.tags_by_count(guardian, limit: 300).count + tags = tag_counts.map {|t, c| { id: t, text: t, count: c } } + render json: { tags: tags } + end + + Discourse.filters.each do |filter| + define_method("show_#{filter}") do + @tag_id = DiscourseTagging.clean_tag(params[:tag_id]) + + # TODO PERF: doesn't scale: + topics_tagged = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: @tag_id).pluck(:topic_id) + + page = params[:page].to_i + + query = TopicQuery.new(current_user, build_topic_list_options) + + results = query.send("#{filter}_results").where(id: topics_tagged) + + if @filter_on_category + category_ids = [@filter_on_category.id] + @filter_on_category.subcategories.pluck(:id) + results = results.where(category_id: category_ids) + end + + @list = query.create_list(:by_tag, {}, results) + + @list.draft_key = Draft::NEW_TOPIC + @list.draft_sequence = DraftSequence.current(current_user, Draft::NEW_TOPIC) + @list.draft = Draft.get(current_user, @list.draft_key, @list.draft_sequence) if current_user + + @list.more_topics_url = list_by_tag_path(tag_id: @tag_id, page: page + 1) + @rss = "tag" + + + if @list.topics.size == 0 && !TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: @tag_id).exists? + raise Discourse::NotFound + else + respond_with_list(@list) + end + end + end + + def show + show_latest + end + + def update + guardian.ensure_can_admin_tags! + + new_tag_id = DiscourseTagging.clean_tag(params[:tag][:id]) + if current_user.staff? + DiscourseTagging.rename_tag(current_user, params[:tag_id], new_tag_id) + end + render json: { tag: { id: new_tag_id }} + end + + def destroy + guardian.ensure_can_admin_tags! + tag_id = params[:tag_id] + TopicCustomField.transaction do + TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: tag_id).delete_all + UserCustomField.delete_all(name: ::DiscourseTagging.notification_key(tag_id)) + StaffActionLogger.new(current_user).log_custom('deleted_tag', subject: tag_id) + end + render json: success_json + end + + def tag_feed + discourse_expires_in 1.minute + + tag_id = ::DiscourseTagging.clean_tag(params[:tag_id]) + @link = "#{Discourse.base_url}/tags/#{tag_id}" + @description = I18n.t("rss_by_tag", tag: tag_id) + @title = "#{SiteSetting.title} - #{@description}" + @atom_link = "#{Discourse.base_url}/tags/#{tag_id}.rss" + + query = TopicQuery.new(current_user) + topics_tagged = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: tag_id).pluck(:topic_id) + latest_results = query.latest_results.where(id: topics_tagged) + @topic_list = query.create_list(:by_tag, {}, latest_results) + + render 'list/list', formats: [:rss] + end + + def search + tags = self.class.tags_by_count(guardian, params.slice(:limit)) + term = params[:q] + if term.present? + term.gsub!(/[^a-z0-9\.\-\_]*/, '') + term.gsub!("_", "\\_") + tags = tags.where('value like ?', "%#{term}%") + end + + tags = tags.count(:value).map {|t, c| { id: t, text: t, count: c } } + + render json: { results: tags } + end + + def notifications + level = current_user.custom_fields[::DiscourseTagging.notification_key(params[:tag_id])] || 1 + render json: { tag_notification: { id: params[:tag_id], notification_level: level.to_i } } + end + + def update_notifications + level = params[:tag_notification][:notification_level].to_i + + current_user.custom_fields[::DiscourseTagging.notification_key(params[:tag_id])] = level + current_user.save_custom_fields + + render json: {notification_level: level} + end + + def check_hashtag + tag_values = params[:tag_values].each(&:downcase!) + + valid_tags = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME, value: tag_values).map do |tag| + { value: tag.value, url: "#{Discourse.base_url}/tags/#{tag.value}" } + end.compact + + render json: { valid: valid_tags } + end + + private + + def ensure_tags_enabled + raise Discourse::NotFound unless SiteSetting.tagging_enabled? + end + + def self.tags_by_count(guardian, opts=nil) + opts = opts || {} + result = TopicCustomField.where(name: DiscourseTagging::TAGS_FIELD_NAME) + .joins(:topic) + .group(:value) + .limit(opts[:limit] || 5) + .order('COUNT(topic_custom_fields.value) DESC') + + guardian.filter_allowed_categories(result) + end + + def set_category_from_params + slug_or_id = params[:category] + return true if slug_or_id.nil? + + parent_slug_or_id = params[:parent_category] + + parent_category_id = nil + if parent_slug_or_id.present? + parent_category_id = Category.query_parent_category(parent_slug_or_id) + raise Discourse::NotFound if parent_category_id.blank? + end + + @filter_on_category = Category.query_category(slug_or_id, parent_category_id) + raise Discourse::NotFound if !@filter_on_category + + guardian.ensure_can_see!(@filter_on_category) + end + + def build_topic_list_options + options = { + page: params[:page], + topic_ids: param_to_integer_list(:topic_ids), + exclude_category_ids: params[:exclude_category_ids], + category: params[:category], + order: params[:order], + ascending: params[:ascending], + min_posts: params[:min_posts], + max_posts: params[:max_posts], + status: params[:status], + filter: params[:filter], + state: params[:state], + search: params[:search], + q: params[:q] + } + options[:no_subcategories] = true if params[:no_subcategories] == 'true' + options[:slow_platform] = true if slow_platform? + + options + end +end diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb index 8f8dcd98e5..a92617e80f 100644 --- a/app/helpers/topics_helper.rb +++ b/app/helpers/topics_helper.rb @@ -14,6 +14,15 @@ module TopicsHelper end breadcrumb.push url: category.url, name: category.name end + + if (tags = topic.tags).present? + tags.each do |tag| + tag_id = DiscourseTagging.clean_tag(tag) + url = "#{Discourse.base_url}/tags/#{tag_id}" + breadcrumb << {url: url, name: tag} + end + end + Plugin::Filter.apply(:topic_categories_breadcrumb, topic, breadcrumb) end diff --git a/app/models/topic.rb b/app/models/topic.rb index 5ac125e303..556130d797 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -6,6 +6,7 @@ require_dependency 'text_sentinel' require_dependency 'text_cleaner' require_dependency 'archetype' require_dependency 'html_prettify' +require_dependency 'discourse_tagging' class Topic < ActiveRecord::Base include ActionView::Helpers::SanitizeHelper @@ -1043,6 +1044,11 @@ SQL builder.exec.first["count"].to_i end + def tags + result = custom_fields[DiscourseTagging::TAGS_FIELD_NAME] + [result].flatten unless result.blank? + end + private def update_category_topic_count_by(num) diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb index cce332a6d0..4abdc36f09 100644 --- a/app/models/topic_list.rb +++ b/app/models/topic_list.rb @@ -81,8 +81,11 @@ class TopicList ft.topic_list = self end - if TopicList.preloaded_custom_fields.present? - Topic.preload_custom_fields(@topics, TopicList.preloaded_custom_fields) + preload_custom_fields = TopicList.preloaded_custom_fields + preload_custom_fields << DiscourseTagging::TAGS_FIELD_NAME if SiteSetting.tagging_enabled + + if preload_custom_fields.present? + Topic.preload_custom_fields(@topics, preload_custom_fields) end @topics diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb index 2a3a49170a..d49257b145 100644 --- a/app/serializers/site_serializer.rb +++ b/app/serializers/site_serializer.rb @@ -1,3 +1,5 @@ +require_dependency 'discourse_tagging' + class SiteSerializer < ApplicationSerializer attributes :default_archetype, @@ -14,7 +16,11 @@ class SiteSerializer < ApplicationSerializer :user_field_max_length, :suppressed_from_homepage_category_ids, :post_action_types, - :topic_flag_types + :topic_flag_types, + :can_create_tag, + :can_tag_topics, + :tags_filter_regexp, + :top_tags has_many :categories, serializer: BasicCategorySerializer, embed: :objects has_many :trust_levels, embed: :objects @@ -81,4 +87,26 @@ class SiteSerializer < ApplicationSerializer UserField.max_length end + def can_create_tag + SiteSetting.tagging_enabled && scope.can_create_tag? + end + + def can_tag_topics + SiteSetting.tagging_enabled && scope.can_tag_topics? + end + + def include_tags_filter_regexp? + SiteSetting.tagging_enabled + end + def tags_filter_regexp + DiscourseTagging::TAGS_FILTER_REGEXP.source + end + + def include_top_tags? + SiteSetting.tagging_enabled && SiteSetting.show_filter_by_tag + end + def top_tags + DiscourseTagging.top_tags + end + end diff --git a/app/serializers/topic_list_item_serializer.rb b/app/serializers/topic_list_item_serializer.rb index a9f961827e..5a8ac8d379 100644 --- a/app/serializers/topic_list_item_serializer.rb +++ b/app/serializers/topic_list_item_serializer.rb @@ -9,7 +9,8 @@ class TopicListItemSerializer < ListableTopicSerializer :op_like_count, :pinned_globally, :bookmarked_post_numbers, - :liked_post_numbers + :liked_post_numbers, + :tags has_many :posters, serializer: TopicPosterSerializer, embed: :objects has_many :participants, serializer: TopicPosterSerializer, embed: :objects @@ -63,4 +64,11 @@ class TopicListItemSerializer < ListableTopicSerializer object.association(:first_post).loaded? end + def include_tags? + SiteSetting.tagging_enabled + end + def tags + object.tags + end + end diff --git a/app/serializers/topic_list_serializer.rb b/app/serializers/topic_list_serializer.rb index 6193888145..f932b644d1 100644 --- a/app/serializers/topic_list_serializer.rb +++ b/app/serializers/topic_list_serializer.rb @@ -6,7 +6,8 @@ class TopicListSerializer < ApplicationSerializer :draft_key, :draft_sequence, :for_period, - :per_page + :per_page, + :tags has_many :topics, serializer: TopicListItemSerializer, embed: :objects @@ -22,4 +23,11 @@ class TopicListSerializer < ApplicationSerializer object.more_topics_url.present? && (object.topics.size == object.per_page) end + def include_tags? + SiteSetting.tagging_enabled && SiteSetting.show_filter_by_tag + end + def tags + DiscourseTagging.top_tags + end + end diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb index bacdb2dcf6..b30d0c9e6e 100644 --- a/app/serializers/topic_view_serializer.rb +++ b/app/serializers/topic_view_serializer.rb @@ -33,7 +33,8 @@ class TopicViewSerializer < ApplicationSerializer :word_count, :deleted_at, :pending_posts_count, - :user_id + :user_id, + :tags attributes :draft, :draft_key, diff --git a/app/views/list/list.erb b/app/views/list/list.erb index bfb7c511c9..9ba31d2a82 100644 --- a/app/views/list/list.erb +++ b/app/views/list/list.erb @@ -2,6 +2,14 @@ <%= server_plugin_outlet "topic_list_header" %> +<%- if SiteSetting.tagging_enabled && @tag_id %> +

    + <%= link_to "#{Discourse.base_url}/t/#{@tag_id}", itemprop: 'item' do %> + <%= @tag_id %> + <% end %> +

    +<% end %> + <% if @category %>

    <% if @category.parent_category %> diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 010999cc92..b227aa3c62 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -17,7 +17,19 @@ <% end %>

    <% end %> + +<%- if SiteSetting.tagging_enabled && @topic_view.topic.tags.present? %> +
    + <%= t 'js.tagging.tags' %>: + + <%- @topic_view.topic.tags.each do |t| %> + <%= t %> + <%- end %> +
    +<% end %> + <%= server_plugin_outlet "topic_header" %> +
    <%- if include_crawler_content? %> diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 6a9f585a81..2bf819fd08 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -1052,6 +1052,9 @@ de: selected: one: "Du hast ein Thema ausgewählt." other: "Du hast {{count}} Themen ausgewählt." + change_tags: "Tags ändern" + choose_new_tags: "Wähle neue Tags für diese Themen:" + changed_tags: "Die Tags dieser Themen wurden geändert." none: unread: "Du hast alle Themen gelesen." new: "Es gibt für dich keine neuen Themen." @@ -2204,6 +2207,8 @@ de: grant_moderation: "Moderation gewähren" revoke_moderation: "Moderation entziehen" backup_operation: "Backup läuft" + deleted_tag: "Tag löschen" + renamed_tag: "Tag umbenennen" screened_emails: title: "Gefilterte E-Mails" description: "Wenn jemand ein Konto erstellt, werden die folgenden E-Mail-Adressen überprüft und es wird die Anmeldung blockiert oder eine andere Aktion ausgeführt." @@ -2699,3 +2704,32 @@ de:

    + + tagging: + all_tags: "Alle Tags" + selector_all_tags: "Alle Tags" + changed: "Tags geändert:" + tags: "Tags" + choose_for_topic: "Wähle optional Tags für dieses Thema" + topics_tagged: "Themen getaggt mit {{tag}}" + delete_tag: "Tag löschen" + delete_confirm: "Bist du sicher, dass du das Tag löschen möchtest?" + rename_tag: "Tag umbenennen" + rename_instructions: "Wähle einen neuen Namen für das Tag:" + sort_by: "Sortieren nach:" + sort_by_count: "Anzahl" + sort_by_name: "Name" + + notifications: + watching: + title: "Beobachten" + description: "Du wirst automatisch alle neuen Themen dieses Tags beobachten. Du wirst über jeden neuen Beitrag und jedes neue Thema benachrichtigt. Die Anzahl der ungelesenen und neuen Beiträge wird neben dem Thema erscheinen." + tracking: + title: "Verfolgen" + description: "Du wirst automatisch alle neuen Themen dieses Tags verfolgen. Die Anzahl der ungelesenen und neuen Beiträge wird neben dem Thema erscheinen." + regular: + title: "Normal" + description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet." + muted: + title: "Stummgeschaltet" + description: "Du erhältst keine Benachrichtigungen über neue Themen mit diesem Tag und es wird nicht in deiner Liste ungelesener Tags erscheinen." diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 482b17ee35..506989e43f 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1164,6 +1164,9 @@ en: selected: one: "You have selected 1 topic." other: "You have selected {{count}} topics." + change_tags: "Change Tags" + choose_new_tags: "Choose new tags for these topics:" + changed_tags: "The tags of those topics were changed." none: unread: "You have no unread topics." @@ -2410,6 +2413,8 @@ en: grant_moderation: "grant moderation" revoke_moderation: "revoke moderation" backup_operation: "backup operation" + deleted_tag: "deleted tag" + renamed_tag: "renamed tag" screened_emails: title: "Screened Emails" description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed." @@ -2704,6 +2709,7 @@ en: login: "Login" plugins: "Plugins" user_preferences: "User Preferences" + tags: "Tags" badges: title: Badges @@ -2922,3 +2928,58 @@ en:

    + + tagging: + all_tags: "All Tags" + selector_all_tags: "all tags" + changed: "tags changed:" + tags: "Tags" + choose_for_topic: "choose optional tags for this topic" + delete_tag: "Delete Tag" + delete_confirm: "Are you sure you want to delete that tag?" + rename_tag: "Rename Tag" + rename_instructions: "Choose a new name for the tag:" + sort_by: "Sort by:" + sort_by_count: "count" + sort_by_name: "name" + + filters: + without_category: "%{filter} %{tag} topics" + with_category: "%{filter} %{tag} topics in %{category}" + + notifications: + watching: + title: "Watching" + description: "You will automatically watch all new topics in this tag. You will be notified of all new posts and topics, plus the count of unread and new posts will also appear next to the topic." + tracking: + title: "Tracking" + description: "You will automatically track all new topics in this tag. A count of unread and new posts will appear next to the topic." + regular: + title: "Regular" + description: "You will be notified if someone mentions your @name or replies to your post." + muted: + title: "Muted" + description: "You will not be notified of anything about new topics in this tag, and they will not appear on your unread tab." + + topics: + none: + unread: "You have no unread topics." + new: "You have no new topics." + read: "You haven't read any topics yet." + posted: "You haven't posted in any topics yet." + latest: "There are no latest topics." + hot: "There are no hot topics." + bookmarks: "You have no bookmarked topics yet." + top: "There are no top topics." + search: "There are no search results." + bottom: + latest: "There are no more latest topics." + hot: "There are no more hot topics." + posted: "There are no more posted topics." + read: "There are no more read topics." + new: "There are no more new topics." + unread: "There are no more unread topics." + top: "There are no more top topics." + bookmarks: "There are no more bookmarked topics." + search: "There are no more search results." + diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 09aa1e8f12..dedf5e6ff3 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -1052,6 +1052,9 @@ es: selected: one: "Has seleccionado 1 tema." other: "Has seleccionado {{count}} temas." + change_tags: "Cambiar etiquetas" + choose_new_tags: "Elegir nuevas etiquetas para estos temas:" + changed_tags: "Las etiquetas de estos temas fueron cambiadas." none: unread: "No hay temas que sigas y que no hayas leído ya." new: "No tienes temas nuevos por leer." @@ -2208,6 +2211,8 @@ es: grant_moderation: "conceder moderación" revoke_moderation: "revocar moderación" backup_operation: "operación de copia de seguridad de respaldo" + deleted_tag: "etiqueta eliminada" + renamed_tag: "etiqueta renombrada" screened_emails: title: "Correos bloqueados" description: "Cuando alguien trata de crear una cuenta nueva, los siguientes correos serán revisados y el registro será bloqueado, o alguna otra acción será realizada." @@ -2703,3 +2708,54 @@ es:

    + + tagging: + all_tags: "Etiquetas" + selector_all_tags: "etiquetas" + changed: "etiquetas cambiadas:" + tags: "Etiquetas" + choose_for_topic: "elegir etiquetas para este tema (opcional)" + delete_tag: "Eliminar etiqueta" + delete_confirm: "¿Seguro que quieres eliminar esta etiqueta?" + rename_tag: "Renombrar etiqueta" + rename_instructions: "Elige un nuevo nombre para la etiqueta:" + sort_by: "Ordenar por:" + sort_by_count: "volumen" + sort_by_name: "nombre" + + notifications: + watching: + title: "Vigilar" + description: "Vigilarás automáticamente todos los nuevos temas con esta etiqueta. Se añadirá un contador de posts nuevos y sin leer al lado del tema y además, se te notificará de cada nuevo tema y post." + tracking: + title: "Seguir" + description: "Seguirás automáticamente todos los nuevos temas con esta etiqueta. Se añadirá un contador de posts nuevos y sin leer al lado del tema." + regular: + title: "Normal" + description: "Se te notificará solo si alguien te menciona con tu @usuario o responde a algún post tuyo." + muted: + title: "Silenciar" + description: "No se te notificará de nuevos temas con esta etiqueta, ni aparecerán en tu pestaña de temas no leídos." + + topics: + none: + unread: "No tienes temas sin leer." + new: "No hay temas nuevos." + read: "Aún no has leído ningún tema." + posted: "Aún no has publicado en ningún tema." + latest: "No hay temas recientes." + hot: "No hay temas candentes" + bookmarks: "Aún no has guardado temas en marcadores." + top: "No hay temas top." + search: "No hay resultados resultados de búsqueda." + bottom: + latest: "No hay más temas recientes." + hot: "No hay más temas candentes." + posted: "No hay más temas en los que hayas publicado." + read: "No hay más temas que hayas leído." + new: "No hay más temas nuevos." + unread: "No hay más temas sin leer." + top: "No hay más temas top." + bookmarks: "No hay más temas en marcadores." + search: "No hay más resultados de búsqueda." + diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index 048a86b1ed..4706ddeb46 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -918,6 +918,9 @@ fa_IR: choose_new_category: "یک دسته بندی جدید برای موضوع انتخاب نمایید" selected: other: "شما تعداد {{count}} موضوع را انتخاب کرده اید." + change_tags: "تغییر برچسب ها" + choose_new_tags: "انتخاب برچسب های جدید برای این موضوع:" + changed_tags: "برچسب های انتخابی برای این موضوع جایگزین شد." none: unread: "موضوع خوانده نشده‌ای ندارید." new: "شما هیچ موضوع تازه‌ای ندارید" @@ -1956,6 +1959,8 @@ fa_IR: change_category_settings: "تغییر تنظیمات دسته بندی" delete_category: "حذف دسته بندی" create_category: "ساخت دسته بندی" + deleted_tag: "حذف برچسب" + renamed_tag: "تغییر نام برچسب" screened_emails: title: "ایمیل ها نمایش داده شده" description: "وقتی کسی سعی می کند یک حساب جدید ایجاد کند، از آدرس ایمیل زیر بررسی و ثبت نام مسدود خواهد شد، و یا برخی از اقدام های دیگر انجام می شود." @@ -2430,3 +2435,27 @@ fa_IR:

    + tagging: + all_tags: "تمام پرچسب ها" + changed: "برچسب های تغییر یافته:" + tags: "برچسب ها" + choose_for_topic: "انتخاب برچسب اختیاری برای این موضوع" + delete_tag: "حذف برچسب" + delete_confirm: "آیا مطمئنید که می خواهید این برچسب را خذف کنید?" + rename_tag: "تغییر نام برچسب" + rename_instructions: "یک نام جدید برای برچسب انتخاب نمایید:" + + notifications: + watching: + title: "تماشا" + description: "شما به صورت خودکار تمام نوشته های این برچسب را مشاهده خواهید کرد، تمام نوشته ها به شما اطلاع رسانی خواهد شد.و تعداد نوشته های خوانده نشده در جلوی موضوعات نشان داده خواهد شد." + tracking: + title: "پی گیری" + description: "شما به صورت خودکار تمام نوشته های این برچسب را پی گیری خواهید کرد، تمام نوشته های خوانده نشده جلوی موضوعات نشان داده خواهد شد." + regular: + title: "منظم" + description: "به شما اطلاع داده خواهد شد اگر کسی به شما اششاره@name یا به نوشته شما پاسخ دهند." + muted: + title: "بی صدا" + description: "به شما هیچ چیزی در باره نوشته های این تگ اطلاع رسانی نخواهد شد." + diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index ad45574ec8..2136048863 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -1019,6 +1019,9 @@ fi: selected: one: "Olet valinnut yhden ketjun." other: "Olet valinnut {{count}} ketjua." + change_tags: "Muuta tagit" + choose_new_tags: "Valitse uudet tagit näille aiheille:" + changed_tags: "Aiheiden tagit on vaihdettu." none: unread: "Sinulla ei ole lukemattomia ketjuja." new: "Sinulla ei ole uusia ketjuja." @@ -2166,6 +2169,8 @@ fi: grant_moderation: "myönnä valvojan oikeudet" revoke_moderation: "peru valvojan oikeudet" backup_operation: "varmuuskopiointi" + deleted_tag: "poistettu tagi" + renamed_tag: "uudelleennimetty tagi" screened_emails: title: "Seulottavat sähköpostiosoitteet" description: "Uuden käyttäjätunnuksen luonnin yhteydessä annettua sähköpostiosoitetta verrataan alla olevaan listaan ja tarvittaessa tunnuksen luonti joko estetään tai suoritetaan muita toimenpiteitä." @@ -2656,3 +2661,27 @@ fi:

    + tagging: + all_tags: "Kaikki tagit" + changed: "muutetut tagit:" + tags: "Tagit" + choose_for_topic: "valitse sopivat tagit aiheelle" + topics_tagged: "Aiheet tagattu {{tag}}" + delete_tag: "Poista tagi" + delete_confirm: "Haluatko varmasti poistaa tagin?" + rename_tag: "Uudelleennimeä tagi" + rename_instructions: "Valitse tagin uusi nimi:" + + notifications: + watching: + title: "Tarkkaile" + description: "Saat ilmoituksen kaikista uusista viesteistä ja ketjuista jotka käyttää tätä tagia. Uusien ja lukemattomien määrä näkyy ketjun yhteydessä." + tracking: + title: "Seuraa" + description: "Seuraat automaattisesti tämän tagin ketjuja ja viestejä. Uusien ja lukemattomien määrä näkyy ketjun yhteydessä." + regular: + title: "Tavallinen" + description: "Saat ilmoituksen kun joku mainitsee @nimesi tai vastaa ketjuun." + muted: + title: "Vaimenna" + description: "Et saa ilmoituksia, eikä se näy lukemattomissa." diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index e46cd3dfbd..1483e4038e 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -1018,6 +1018,9 @@ fr: selected: one: "Vous avez sélectionné 1 sujet." other: "Vous avez sélectionné {{count}} sujets." + change_tags: "Modifier les tags" + choose_new_tags: "Choisir de nouveaux tags pour ces sujets :" + changed_tags: "Les tags de ces sujets ont été modifiés." none: unread: "Vous n'avez aucun sujet non lu." new: "Vous n'avez aucun nouveau sujet." @@ -2164,6 +2167,8 @@ fr: grant_moderation: "Accorder les droits de modération" revoke_moderation: "Révoquer les droits de modération" backup_operation: "sauvegarde" + deleted_tag: "tag supprimé" + renamed_tag: "tag renommé" screened_emails: title: "Courriels affichés" description: "Lorsque quelqu'un essaye de créé un nouveau compte, les adresses de courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée." @@ -2649,3 +2654,26 @@ fr:

    + tagging: + all_tags: "Tous les tags" + changed: "tags modifiés:" + tags: "Tags" + choose_for_topic: "choisissez des tags pour ce sujet (optionnel)" + delete_tag: "Supprimer ce tag" + delete_confirm: "Êtes-vous sûr de vouloir supprimer ce tag ?" + rename_tag: "Renommer ce tag" + rename_instructions: "Choisissez un nouveau nom pour le tag :" + + notifications: + watching: + title: "Surveiller" + description: "Vous surveillerez automatiquement les nouveaux sujets portant ce tag. Vous serez averti de tous les nouveaux messages et sujets. De plus, le nombre de messages non lus et nouveaux apparaîtra en regard du sujet." + tracking: + title: "Suivre" + description: "Vous suivrez automatiquement les nouveaux sujets portant ce tag. Le nombre de messages non lus et nouveaux apparaîtra en regard du sujet." + regular: + title: "Normal" + description: "Vous serez averti si quelqu'un mentionne votre @pseudo ou répond à votre message." + muted: + title: "Silencieux" + description: "Vous ne recevrez aucune notification des sujets portant ce tag, et ils n'apparaîtront pas dans votre onglet non lus." diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 36e38590e1..452b8630ec 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -899,6 +899,9 @@ nb_NO: selected: one: "Du har valgt 1 emne." other: "Du har valgt {{count}} emner." + change_tags: "Endre emneord" + choose_new_tags: "Velg nye emneord for disse emnene:" + changed_tags: "Emneord for disse emnene ble endret." none: unread: "Du har ingen uleste emner å lese." new: "Du har ingen nye emner å lese." @@ -1950,6 +1953,8 @@ nb_NO: roll_up: "rull opp IP-blokker" delete_category: "slett kategori" create_category: "opprett kategori" + deleted_tag: "Slettet emneord" + renamed_tag: "Endret emneord" screened_emails: title: "Kontrollerte e-poster" description: "Når noen forsøker å lage en ny konto, vil de følgende e-postadressene bli sjekket, og registreringen vil bli blokkert, eller en annen handling vil bli utført." @@ -2374,3 +2379,27 @@ nb_NO: name: Annet posting: name: Posting + tagging: + all_tags: "Alle emneord" + changed: "emneord endret:" + tags: "Emneord" + choose_for_topic: "velg ekstra emneord for dette emnet" + delete_tag: "Slett emneord" + delete_confirm: "Er du sikker påat du ønsker å slette dette emneordet?" + rename_tag: "Endre emneord" + rename_instructions: "Velg et nytt navn på dette emneordet:" + + notifications: + watching: + title: "Følger" + description: "Du vil automatisk følge alle nye emner med dette emneordet. Du vil bli varslet om alle nye innlegg og emner samt at antallet uleste og nye innlegg vil vises sammen med emneoppføringen." + tracking: + title: "Følger" + description: "Du vil automatisk følge alle nye emner med dette emneordet. Antallet uleste og nye innlegg vil vises sammen med emneoppføringen." + regular: + title: "Vanlig" + description: "Du vil bli varslet om noen nevnet ditt @navn eller svarer på din post." + muted: + title: "Dempet" + description: "Du vil ikke bli varslet om noe vedrørende disse emneneordene og de vil ikke vises i din ulest-liste." + diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 51327dcd44..ee67063e4d 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -2699,3 +2699,9 @@ pl_PL:

    + tagging: + all_tags: "Wszystkie tagi" + changed: "zmienione tagi:" + tags: "Tagi" + choose_for_topic: "wybierz opcjonalne tagi dla tego tematu" + topics_tagged: "Tematy otagowane jako {{tag}}" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 964b58e174..ed2dba1d68 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -1052,6 +1052,9 @@ pt: selected: one: "Selecionou 1 tópico." other: "Selecionou {{count}} tópicos." + change_tags: "Alterar etiquetas" + choose_new_tags: "Escolher novas etiquetas para estes tópicos:" + changed_tags: "As etiquetas desses tópicos foram alteradas." none: unread: "Tem tópicos não lidos." new: "Não tem novos tópicos." @@ -2208,6 +2211,8 @@ pt: grant_moderation: "conceder moderação" revoke_moderation: "revogar moderação" backup_operation: "operação de cópia de segurança" + deleted_tag: "etiqueta apagada" + renamed_tag: "etiqueta renomeada" screened_emails: title: "Emails Filtrados" description: "Quando alguém tenta criar uma nova conta, os seguintes endereços de email serão verificados e o registo será bloqueado, ou outra ação será executada." @@ -2703,3 +2708,25 @@ pt:

    + tagging: + all_tags: "Todas as etiquetas" + changed: "etiquetas alteradas:" + tags: "Etiquetas" + choose_for_topic: "escolher etiqetas opcionais para este tópico" + delete_tag: "Apagar etiqueta" + delete_confirm: "Tem a certeza que quer apagar esta etiqueta?" + rename_tag: "Renomear Etiqueta" + rename_instructions: "Escolher um novo nome para a etiqueta:" + notifications: + watching: + title: "A vigiar" + description: "Irá automaticamente vigiar todos os novos tópicos com esta etiqueta. Será notoficado de todas as novas mensagens e tópicos." + tracking: + title: "A acompanhar" + description: "Irá automaticamente acompanhar todos os novos tópcicos com esta etiqueta" + regular: + title: "Habitual" + description: "Será notoficado se mencionarem o seu @nome ou se alguém lhe responder" + muted: + title: "Silenciado" + description: "Não será notoficado sobre nenhum tópico com esta etiqueta" diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 55ddb71147..b6ddc76de0 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -1049,6 +1049,9 @@ pt_BR: selected: one: "Você selecionou 1 tópico." other: "Você selecionou {{count}} tópicos." + change_tags: "Alterar Tags" + choose_new_tags: "Escolha novas tags para estes tópicos:" + changed_tags: "As tags desses tópicos foram alteradas." none: unread: "Não há nenhum tópico não lido." new: "Não há tópicos novos." @@ -2148,6 +2151,8 @@ pt_BR: block_user: "bloquear usuário" unblock_user: "desbloquear usuário" backup_operation: "operação de backup" + deleted_tag: "tag removida" + renamed_tag: "tag renomeada" screened_emails: title: "Emails Filtrados" description: "Quando alguém tenta cria uma nova conta, os seguintes endereços de email serão verificados e o registro será bloqueado, ou outra ação será executada." @@ -2628,3 +2633,52 @@ pt_BR:

    + tagging: + all_tags: "Todas as Tags" + selector_all_tags: "todas as tags" + changed: "tags alteradas:" + tags: "Tags" + choose_for_topic: "escolha tags opcionais para este tópico" + delete_tag: "Remover Tag" + delete_confirm: "Você tem certeza que quer remover essa tag?" + rename_tag: "Renomear Tag" + rename_instructions: "Escolha um novo nome para a tag:" + sort_by: "Ordenar por:" + sort_by_count: "número" + sort_by_name: "nome" + + notifications: + watching: + title: "Observando" + description: "Você vai observar automaticamente todos os novos tópicos dessa tag. Você será notificado de todas as novas mensagens e tópicos, e uma contagem de novas respostas será mostrada ao lado do tópico." + tracking: + title: "Monitorando" + description: "Você vai monitorar automaticamente todos os novos tópicos dessa tag. Uma contagem de novas respostas será mostrada ao lado do tópico." + regular: + title: "Normal" + description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem." + muted: + title: "Silenciado" + description: "Você nunca será notificado sobre novos tópicos nessa tag, e eles não aparecerão na sua aba não lidas." + + topics: + none: + unread: "Você não possui tópicos não lidos." + new: "Você não possui novos tópicos." + read: "Você não leu nenhum tópico ainda." + posted: "Você não postou em nenhum tópico ainda." + latest: "Não há tópicos mais recentes." + hot: "Não há tópicos quentes." + bookmarks: "Você não possui tópicos favoritos ainda." + top: "Não há melhores tópicos." + search: "Nenhum resultado encontrado." + bottom: + latest: "Não há mais tópicos mais recentes." + hot: "Não há mais tópicos quentes." + posted: "Não há mais tópicos postados." + read: "Não há mais tópicos lidos." + new: "Não há mais tópicos novos." + unread: "Não há mais tópicos não lidos." + top: "Não há mais melhores tópicos." + bookmarks: "Não há mais tópicos favoritos." + search: "Não há mais resultados de busca." diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index c80200f509..42180d736c 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -1098,6 +1098,9 @@ ru: few: "Вы выбрали {{count}} темы." many: "Вы выбрали {{count}} тем." other: "Вы выбрали {{count}} тем." + change_tags: "Изменить теги" + choose_new_tags: "Выберите новые теги для этих тем:" + changed_tags: "Теги изменены." none: unread: "У вас нет непрочитанных тем." new: "У вас нет новых тем." @@ -2303,6 +2306,8 @@ ru: revoke_admin: "отозваны права администратора" grant_moderation: "выданы права модератора" revoke_moderation: "отозваны права модератора" + deleted_tag: "удалить тег" + renamed_tag: "переименовать тег" screened_emails: title: "Почтовые адреса" description: "Когда кто-то создает новую учетную запись, проверяется данный почтовый адрес и регистрация блокируется или производятся другие дополнительные действия." @@ -2793,3 +2798,30 @@ ru:

    + tagging: + all_tags: "Все теги" + selector_all_tags: "все теги" + changed: "теги изменены:" + tags: "Теги" + choose_for_topic: "выберите теги для темы" + delete_tag: "Удалить тег" + delete_confirm: "Удалить тег?" + rename_tag: "Переименовать тег" + rename_instructions: "Выберите новое имя для тега:" + sort_by: "Сортировать по:" + sort_by_count: "количеству" + sort_by_name: "имени" + + notifications: + watching: + title: "Наблюдать" + description: "Уведомлять о каждой новой теме с этим тегом и показывать счетчик новых непрочитанных ответов." + tracking: + title: "Следить" + description: "Количество непрочитанных сообщений появится рядом с названием новых тем с этим тегом." + regular: + title: "Уведомлять" + description: "Вам придет уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." + muted: + title: "Без уведомлений" + description: "Не уведомлять об изменениях в новых темах с этим тегом и скрыть их из непрочитанных." diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 153ab3ef0e..85c88db7f4 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -991,6 +991,9 @@ tr_TR: choose_new_category: "Konular için yeni bir kategori seçin:" selected: other: "{{count}} konu seçtiniz." + change_tags: "Etiketleri değiştir" + choose_new_tags: "Bu konular için yeni etiket seç:" + changed_tags: "Seçtğiniz konular için etiketler değiştirildi." none: unread: "Okunmamış konunuz yok." new: "Yeni konunuz yok." @@ -2081,6 +2084,8 @@ tr_TR: grant_moderation: "moderasyon yetkisi ver" revoke_moderation: "moderasyon yetkisini kaldır" backup_operation: "yedek operasyonu" + deleted_tag: "silinmiş etiket" + renamed_tag: "yeniden adlandırılmış etiket" screened_emails: title: "Taranmış E-postalar" description: "Biri yeni bir hesap oluşturmaya çalıştığında, aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek veya başka bir aksiyon alınacak." @@ -2557,3 +2562,26 @@ tr_TR:

    + tagging: + all_tags: "Tüm etiketler" + changed: "Etiketler değişti:" + tags: "Etiketler" + choose_for_topic: "Bu konu için opsiyonel olarak bir etiket seçin" + delete_tag: "Etiketi sil" + delete_confirm: "Bu etiketi kaldırmak istediğinize emin misiniz?" + rename_tag: "Etiketi yeniden adlandır" + rename_instructions: "Etiket için yeni bir ad girin:" + + notifications: + watching: + title: "Gözleniyor" + description: "Bu etikette ki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek." + tracking: + title: "Takip Ediliyor" + description: "Bu etikette ki her yeni gönderi takip edilecek. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek." + regular: + title: "Standart" + description: "Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." + muted: + title: "Susturuldu" + description: "Bu etiket okunmamışlar sekmenizde belirmeyecek, ve hakkında hiç bir bildirim almayacaksınız." diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 66e9c06c66..d5f127fe06 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -1005,6 +1005,9 @@ zh_CN: choose_new_category: "为主题选择新分类：" selected: other: "你已经选择了 {{count}}个主题" + change_tags: "更改标签" + choose_new_tags: "为这些主题选择新标签：" + changed_tags: "这些主题的标签已被修改。" none: unread: "你没有未读主题。" new: "你没有新主题可读。" @@ -2100,6 +2103,8 @@ zh_CN: grant_moderation: "授予版主权限" revoke_moderation: "撤销版主权限" backup_operation: "备份操作" + deleted_tag: "deleted tag" + renamed_tag: "renamed tag" screened_emails: title: "被屏蔽的邮件地址" description: "当有人试图用以下邮件地址注册时，将受到阻止或其它系统操作。" @@ -2578,3 +2583,52 @@ zh_CN:

    + tagging: + all_tags: "全部标签" + selector_all_tags: "所有标签" + changed: "标签更改：" + tags: "标签" + choose_for_topic: "为主题选择可选标签" + delete_tag: "删除标签" + delete_confirm: "你确定要删除该标签？" + rename_tag: "重命名标签" + rename_instructions: "为标签选择一个新的名字：" + sort_by: "排列顺序：" + sort_by_count: "数量" + sort_by_name: "名字" + + notifications: + watching: + title: "关注" + description: "你能自动关注该标签下的所有主题。一旦与这个标签有关的新主题和新帖子发表，你都会收到通知。未读贴和新帖子的数量将出现在主题列表中每个主题的标题后。" + tracking: + title: "追踪" + description: "你能自动追踪这个标签下的所有新主题。未读贴和新帖子的数量将出现在主题列表中每个主题的标题后。" + regular: + title: "常规" + description: "当有人@你或者回复你的帖子时，你才会收到通知。" + muted: + title: "防打扰" + description: "你不会收到该标签下的新主题的任何通知，也不会在你的未阅选项卡中显示。" + + topics: + none: + unread: "你没有未读主题。" + new: "你没有近期主题。" + read: "你还未阅读任何主题。" + posted: "你还未在任何主题中回复。" + latest: "没有最新主题。" + hot: "没有热门主题。" + bookmarks: "你还没有加上书签的主题。" + top: "没有热门主题。" + search: "搜索无结果。" + bottom: + latest: "没有更多最新主题了。" + hot: "没有更多热门主题了。" + posted: "没有更多发表的主题了。" + read: "没有更多读过的主题了。" + new: "没有更多近期主题了。" + unread: "没有更多未读主题了。" + top: "没有更多热门主题了。" + bookmarks: "没有更多加上书签的主题了。" + search: "没有更多搜索结果了。" diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index ba044fc61b..baf013524a 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -1101,6 +1101,19 @@ de: default_categories_watching: "Liste der standardmäßig beobachteten Kategorien." default_categories_tracking: "Liste der standardmäßig gefolgten Kategorien." default_categories_muted: "Liste der standardmäßig stummgeschalteten Kategorien." + tagging_enabled: "Nutzern erlauben Themen zu taggen?" + min_trust_to_create_tag: "Minimale Vertrauensstufe um ein Tag zu erstellen." + max_tags_per_topic: "Maximale Anzahl von Tags, die einem Thema zugeordnet werden können." + max_tag_length: "Maximale Anzahl von Zeichen, die in einem Tag verwendet werden können." + max_tag_search_results: "Maximale Anzahl von Ergebnissen, die bei der Suche nach Tags angezeigt werden." + show_filter_by_tag: "Dropdown-Liste zum Filtern von Theman nach Tag anzeigen." + max_tags_in_filter_list: "Maximale Anzahl von Tags in der Dropdown-Liste. Die meist genutzten Tags werden angezeigt." + tags_sort_alphabetically: "Anzeige der Tags in alphabetischer Reihenfolge. Standard ist die Sortierung nach Beliebtheit." + tag_style: "Visuelle Darstellung der Tag-Schildchen." + staff_tags: "Eine Liste von Tags, die nur von Mitarbeitern verwendet werden können" + min_trust_level_to_tag_topics: "Minimal benötigte Vertrauensstufe zum Taggen von Themen" + suppress_overlapping_tags_in_list: "Verstecke Tags in Listen, wenn diese mit dem Titel überlappen" + remove_muted_tags_from_latest: "Zeige Themen mit stummgeschalteten Tags nicht in der Liste der aktuellen Themen an." errors: invalid_email: "Ungültige E-Mail-Ad­res­se" invalid_username: "Es gibt keinen Benutzer mit diesem Benutzernamen." @@ -2048,3 +2061,9 @@ de: activemodel: errors: <<: *errors + tags: + staff_tag_disallowed: "Das Tag \"%{tag}\" kann nur von Mitarbeitern hinzugefügt werden." + staff_tag_remove_disallowed: "Das Tag \"%{tag}\" kann nur von Mitarbeitern entfernt werden." + rss_by_tag: "Themen getaggt mit %{tag}" + rss_description: + tag: "Getaggte Themen" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 4b19733f5a..d656359e39 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1317,6 +1317,20 @@ en: default_categories_tracking: "List of categories that are tracked by default." default_categories_muted: "List of categories that are muted by default." + tagging_enabled: "Enable tags on topics?" + min_trust_to_create_tag: "The minimum trust level required to create a tag." + max_tags_per_topic: "The maximum tags that can be applied to a topic." + max_tag_length: "The maximum amount of characters that can be used in a tag." + max_tag_search_results: "When searching for tags, the maxium number of results to show." + show_filter_by_tag: "Show a dropdown to filter a topic list by tag." + max_tags_in_filter_list: "Maximum number of tags to show in the filter dropdown. The most used tags will be shown." + tags_sort_alphabetically: "Show tags in alphabetical order. Default is to show in order of popularity." + tag_style: "Visual style for tag badges." + staff_tags: "A list of tags that can only be applied by staff members" + min_trust_level_to_tag_topics: "Minimum trust level required to tag topics" + suppress_overlapping_tags_in_list: "Hide tags from list views, if they overlap with title" + remove_muted_tags_from_latest: "Don't show topics tagged with muted tags in the latest topic list." + errors: invalid_email: "Invalid email address." invalid_username: "There's no user with that username." @@ -3006,3 +3020,10 @@ en: topic_invite: user_exists: "Sorry, that user has already been invited. You may only invite a user to a topic once." + + tags: + staff_tag_disallowed: "The tag \"%{tag}\" may only be applied by staff." + staff_tag_remove_disallowed: "The tag \"%{tag}\" may only be removed by staff." + rss_by_tag: "Topics tagged %{tag}" + rss_description: + tag: "Tagged topics" diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 9b9d1c42de..49cb33a84c 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -1110,6 +1110,19 @@ es: default_categories_watching: "Lista de categorías que están vigiladas por defecto." default_categories_tracking: "Lista de categorías que están seguidas por defecto" default_categories_muted: "Lista de categorías que están silenciadas por defecto." + tagging_enabled: "¿Permitir a los usuarios etiquetar temas?" + min_trust_to_create_tag: "Mínimo nivel de confianza requerido para crear una etiqueta." + max_tags_per_topic: "Número máximo de etiquetas que pueden añadirse a un tema." + max_tag_length: "Longitud máxima de caracteres que puede tener el nombre de una etiqueta." + max_tag_search_results: "Máximo número de resultados a mostrar al buscar etiquetas." + show_filter_by_tag: "Mostrar un desplegable para filtrar la lista de temas por etiqueta." + max_tags_in_filter_list: "Máximo número de etiquetas a mostrar en el desplegable. Se mostrarán las más usadas." + tags_sort_alphabetically: "Mostrar etiquetas en orden alfabético. Por defecto se muestran por popularidad." + tag_style: "Estilo visual de los distintivos de etiqueta." + staff_tags: "Una lista de etiquetas que sólo podrá ser aplicada por administradores o moderadores" + min_trust_level_to_tag_topics: "Mínimo nivel de confianza requerido para etiquetar temas" + suppress_overlapping_tags_in_list: "Ocultar etiquetas de la vista de listado si se solapan con el título" + remove_muted_tags_from_latest: "No mostrar temas etiquetados con etiquetas silenciadas en la lista de temas recientes." errors: invalid_email: "Dirección de correo electrónico inválida. " invalid_username: "No existe ningún usuario con ese nombre de usuario. " @@ -2228,3 +2241,9 @@ es: activemodel: errors: <<: *errors + tags: + staff_tag_disallowed: "La etiqueta \"%{tag}\" sólo puede ser aplicada por los administradores." + staff_tag_remove_disallowed: "La etiqueta \"%{tag}\" sólo puede ser eliminada por los administradores." + rss_by_tag: "Temas con la etiqueta %{tag}" + rss_description: + tag: "Temas etiquetados" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index d367f254f4..34a3cfcf43 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -913,6 +913,10 @@ fa_IR: emoji_set: "می‌خواهید ایموجی شما چطور باشد؟" enforce_square_emoji: "تحمیل نسبت ابعاد مربع به تمام شکلک ها emojis . " approve_unless_trust_level: "نوشته ها برای کاربران پایین ت از این سطح اعتماد نیاز به تایید دارد. " + tagging_enabled: "کاربران اجازه انتخاب برچسب برای موضوعات داشته باشند?" + min_trust_to_create_tag: "حداقل سطح اعتماد مورد نیاز برای انتخاب برچسب؟." + max_tags_per_topic: "حداکثر تعداد برچسب انتخابی برای موضوع." + max_tag_length: "حداقل کراکتر یک نوشته برای برچسب انتخابی." errors: invalid_email: "آدرس ایمیل نامعتبر" invalid_username: "هیچ کاربری با این نام کاربری وجود ندارد." @@ -1291,3 +1295,6 @@ fa_IR: activemodel: errors: <<: *errors + rss_by_tag: "موضوعات برچسب خورد %{tag}" + rss_description: + tag: "موضوعات برچسب خورد" diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 77b404e589..9770a1a231 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -1112,6 +1112,10 @@ fi: default_categories_watching: "Lista oletuksena tarkkailtavista alueista." default_categories_tracking: "Lista oletuksena seurattavista alueista." default_categories_muted: "Lista oletuksena vaimennetuista alueista." + tagging_enabled: "Salli käyttäjien tagata viestejä?" + min_trust_to_create_tag: "Alin luottamustaso tagin luomiseen." + max_tags_per_topic: "Tagien maksimiäärä per aihe." + max_tag_length: "Tagien merkkien maksimimäärä." errors: invalid_email: "Sähköpostiosoite ei kelpaa." invalid_username: "Tällä nimellä ei löydy käyttäjää." @@ -2270,3 +2274,6 @@ fi: activemodel: errors: <<: *errors + rss_by_tag: "Aiheet tagattu %{tag}" + rss_description: + tag: "Tagatut aiheet" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 0ed9723409..b6900673de 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -1094,6 +1094,10 @@ fr: default_categories_watching: "Liste de catégories surveillées par défaut." default_categories_tracking: "Liste de catégories suivies par défaut." default_categories_muted: "Liste de catégories silencées par défaut." + tagging_enabled: "Autoriser les utilisateurs à mettre des tags sur les sujets ?" + min_trust_to_create_tag: "Le niveau de confiance requis pour créer un tag." + max_tags_per_topic: "Le nombre maximum de tags qui peuvent être ajouté à un sujet." + max_tag_length: "The nombre maximum de caractères qui peuvent être utilisés pour un tag." errors: invalid_email: "Adresse de courriel invalide." invalid_username: "Il n'y a pas d'utilisateur ayant ce pseudo." @@ -2193,3 +2197,6 @@ fr: activemodel: errors: <<: *errors + rss_by_tag: "Sujets portant le tag %{tag}" + rss_description: + tag: "Sujet tagués" diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index f8786663a2..b91f1c7ffa 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -821,6 +821,10 @@ pl_PL: approve_unless_trust_level: "Posty użytkowników poniżej tego poziomu zaufania muszą być zatwierdzane" default_categories_watching: "Lista kategorii obserwowanych domyślnie." default_categories_tracking: "Lista kategorii śledzonych domyślnie." + tagging_enabled: "Pozwolić użytkownikom na tagowanie tematów?" + min_trust_to_create_tag: "Minimalny poziom zaufania dla tworzenia nowych tagów." + max_tags_per_topic: "Maksymalna ilość tagów przypisanych do tematu." + max_tag_length: "Maksymalna ilość znaków per tag." errors: invalid_email: "Nieprawidłowy adres email." invalid_username: "Użytkownik o takiej nazwie nie istnieje." @@ -1216,3 +1220,6 @@ pl_PL: activemodel: errors: <<: *errors + rss_by_tag: "Tematy otagowane jako %{tag}" + rss_description: + tag: "Otagowane tematy" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index e1f67d2fc9..e7882be428 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -1002,6 +1002,19 @@ pt_BR: emoji_set: "Como você gostaria do seu emoji?" enforce_square_emoji: "Forçar proporção quadrangular para todos emojis." approve_unless_trust_level: "Mensagens para os usuários abaixo deste nível de confiança devem ser aprovados" + tagging_enabled: "Permitir que usuários coloquem tags em tópicos?" + min_trust_to_create_tag: "O nível de confiança mínimo necessário para criar uma tag." + max_tags_per_topic: "O número máximo de tags que podem ser aplicados a um tópico." + max_tag_length: "O número máximo de caracteres que pode ser usado em uma tag." + max_tag_search_results: "Quando buscando por tags, o número máximo de resultados a exibir." + show_filter_by_tag: "Exibir um dropdown para filtrar uma lista de tópicos por uma tag." + max_tags_in_filter_list: "Número máximo de tags no filtro do dropdown. As tags mais utilizadas serão exibidas." + tags_sort_alphabetically: "Exibir tags em ordem alfabetica. O padrão é exibí-las em ordem de popularidade." + tag_style: "Estilo visual para as insígnias de tag." + staff_tags: "Uma lista de tags que só podem ser aplicadas por membros da moderação" + min_trust_level_to_tag_topics: "Nível de confiança mínimo necessário para aplicar uma tag" + suppress_overlapping_tags_in_list: "Esconder tags das visualizações de lista, se elas se sobreporem ao título" + remove_muted_tags_from_latest: "Não mostrar tópicos com tags silenciadas na lista de tópicos recentes." errors: invalid_email: "Endereço de email inválido" invalid_username: "Não há nenhum usuário com esse nome de usuário." @@ -1516,3 +1529,9 @@ pt_BR: activemodel: errors: <<: *errors + tags: + staff_tag_disallowed: "A tag \"%{tag}\" só pode ser aplicada pela moderação." + staff_tag_remove_disallowed: "A tag \"%{tag}\" só pode ser removida pela moderação." + rss_by_tag: "Tópicos com a tag %{tag}" + rss_description: + tag: "Tópicos com tag" diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 0bf20b9894..a31e114a62 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -984,6 +984,10 @@ tr_TR: default_categories_watching: "Öntanımlı olarak, izlenen kategorilerin listesi." default_categories_tracking: "Öntanımlı olarak, takip edilen kategorilerin listesi." default_categories_muted: "Öntanımlı olarak, sesi kısılan kategorilerin listesi." + tagging_enabled: "Kullanıcılar konularına etiket ekleyebilsinler mi?" + min_trust_to_create_tag: "Etiket oluşturmak için gereken minumum güven seviyesi." + max_tags_per_topic: "Bir konu en fazla kaç adet etiket eklenebilir." + max_tag_length: "Bir etiket en fazla kaç karakterde oluşabilir." errors: invalid_email: "Geçersiz e-posta adresi." invalid_username: "Bu kullanıcı adı ile bir kullanıcı bulunmuyor." @@ -1452,3 +1456,6 @@ tr_TR: activemodel: errors: <<: *errors + rss_by_tag: "Konu %{tag} ile etiketlenmiştir." + rss_description: + tag: "Etiketlenmiş konular" diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index a8b27058ed..ec818080b0 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -1079,6 +1079,18 @@ zh_CN: default_categories_watching: "分类列表默认跟踪。" default_categories_tracking: "分类列表默认追踪。" default_categories_muted: "分类列表默认不显示。" + tagging_enabled: "允许用户为主题设置标签？" + min_trust_to_create_tag: "允许创建标签的最小信任等级。" + max_tags_per_topic: "一个主题最多允许有多少个标签。" + max_tag_length: "一个标签允许的最大字符数。" + max_tag_search_results: "当搜索标签时，显示的最多几个结果。" + show_filter_by_tag: "显示一个下拉菜单按照标签过滤主题列表。" + max_tags_in_filter_list: "过滤下拉菜单中显示的最大标签数。最常用的标签将优先显示。" + tags_sort_alphabetically: "按照字母顺序显示标签。默认显示顺序是流行度。" + tag_style: "标签的视觉样式。" + staff_tags: "只可由志愿设置的标签列表" + min_trust_level_to_tag_topics: "给主题加标签的最小信任等级" + suppress_overlapping_tags_in_list: "如果在列表视图中标签覆盖了主题，则隐藏标签" errors: invalid_email: "电子邮箱地址无效。" invalid_username: "没有这个用户名的用户。" @@ -2452,3 +2464,9 @@ zh_CN: activemodel: errors: <<: *errors + tags: + staff_tag_disallowed: "标签\"%{tag}\"只可以由职员标记。" + staff_tag_remove_disallowed: "标签\"%{tag}\"只可以由职员删除。" + rss_by_tag: "%{tag}标签的主题" + rss_description: + tag: "加标签的主题" diff --git a/config/routes.rb b/config/routes.rb index 69a57eff7e..b1e72d24ac 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -606,6 +606,29 @@ Discourse::Application.routes.draw do get "manifest.json" => "metadata#manifest", as: :manifest get "opensearch" => "metadata#opensearch", format: :xml + scope "/tags" do + get '/' => 'tags#index' + get '/filter/list' => 'tags#index' + get '/filter/search' => 'tags#search' + get '/check' => 'tags#check_hashtag' + constraints(tag_id: /[^\/]+?/, format: /json|rss/) do + get '/:tag_id.rss' => 'tags#tag_feed' + get '/:tag_id' => 'tags#show', as: 'list_by_tag' + get '/c/:category/:tag_id' => 'tags#show' + get '/c/:parent_category/:category/:tag_id' => 'tags#show' + get '/:tag_id/notifications' => 'tags#notifications' + put '/:tag_id/notifications' => 'tags#update_notifications' + put '/:tag_id' => 'tags#update' + delete '/:tag_id' => 'tags#destroy' + + Discourse.filters.each do |filter| + get "/:tag_id/l/#{filter}" => "tags#show_#{filter}" + get "/c/:category/:tag_id/l/#{filter}" => "tags#show_#{filter}" + get "/c/:parent_category/:category/:tag_id/l/#{filter}" => "tags#show_#{filter}" + end + end + end + Discourse.filters.each do |filter| root to: "list##{filter}", constraints: HomePageConstraint.new("#{filter}"), :as => "list_#{filter}" end diff --git a/config/site_settings.yml b/config/site_settings.yml index ea6fdf5324..3a593ce3e7 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1157,3 +1157,57 @@ user_preferences: default_categories_muted: type: category_list default: '' + +tags: + tagging_enabled: + client: true + default: false + refresh: true + tag_style: + client: true + type: enum + default: 'simple' + choices: + - simple + - bullet + - box + preview: '
    tag1tag2
    ' + max_tags_per_topic: + default: 5 + client: true + max_tag_length: + default: 20 + client: true + min_trust_to_create_tag: + default: 3 + enum: 'TrustLevelSetting' + min_trust_level_to_tag_topics: + default: 0 + enum: 'TrustLevelSetting' + client: true + max_tag_search_results: + client: true + default: 5 + min: 1 + show_filter_by_tag: + client: true + default: false + refresh: true + max_tags_in_filter_list: + default: 30 + min: 1 + refresh: true + tags_sort_alphabetically: + client: true + default: false + refresh: true + staff_tags: + type: list + client: true + default: '' + suppress_overlapping_tags_in_list: + default: false + client: true + remove_muted_tags_from_latest: + default: false + diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb new file mode 100644 index 0000000000..944f8bfeb7 --- /dev/null +++ b/lib/discourse_tagging.rb @@ -0,0 +1,116 @@ +module DiscourseTagging + + TAGS_FIELD_NAME = "tags" + TAGS_FILTER_REGEXP = /[<\\\/\>\#\?\&\s]/ + + # class Engine < ::Rails::Engine + # engine_name "discourse_tagging" + # isolate_namespace DiscourseTagging + # end + + def self.clean_tag(tag) + tag.downcase.strip[0...SiteSetting.max_tag_length].gsub(TAGS_FILTER_REGEXP, '') + end + + def self.staff_only_tags(tags) + return nil if tags.nil? + + staff_tags = SiteSetting.staff_tags.split("|") + + tag_diff = tags - staff_tags + tag_diff = tags - tag_diff + + tag_diff.present? ? tag_diff : nil + end + + def self.tags_for_saving(tags, guardian) + + return [] unless guardian.can_tag_topics? + + return unless tags + + tags.map! {|t| clean_tag(t) } + tags.delete_if {|t| t.blank? } + tags.uniq! + + # If the user can't create tags, remove any tags that don't already exist + # TODO: this is doing a full count, it should just check first or use a cache + unless guardian.can_create_tag? + tag_count = TopicCustomField.where(name: TAGS_FIELD_NAME, value: tags).group(:value).count + tags.delete_if {|t| !tag_count.has_key?(t) } + end + + return tags[0...SiteSetting.max_tags_per_topic] + end + + def self.notification_key(tag_id) + "tags_notification:#{tag_id}" + end + + def self.auto_notify_for(tags, topic) + # This insert will run up to SiteSetting.max_tags_per_topic times + tags.each do |tag| + key_name_sql = ActiveRecord::Base.sql_fragment("('#{notification_key(tag)}')", tag) + + sql = <<-SQL + INSERT INTO topic_users(user_id, topic_id, notification_level, notifications_reason_id) + SELECT ucf.user_id, + #{topic.id.to_i}, + CAST(ucf.value AS INTEGER), + #{TopicUser.notification_reasons[:plugin_changed]} + FROM user_custom_fields AS ucf + WHERE ucf.name IN #{key_name_sql} + AND NOT EXISTS(SELECT 1 FROM topic_users WHERE topic_id = #{topic.id.to_i} AND user_id = ucf.user_id) + AND CAST(ucf.value AS INTEGER) <> #{TopicUser.notification_levels[:regular]} + SQL + + ActiveRecord::Base.exec_sql(sql) + end + end + + def self.rename_tag(current_user, old_id, new_id) + sql = <<-SQL + UPDATE topic_custom_fields AS tcf + SET value = :new_id + WHERE value = :old_id + AND name = :tags_field_name + AND NOT EXISTS(SELECT 1 + FROM topic_custom_fields + WHERE value = :new_id AND name = :tags_field_name AND topic_id = tcf.topic_id) + SQL + + user_sql = <<-SQL + UPDATE user_custom_fields + SET name = :new_user_tag_id + WHERE name = :old_user_tag_id + AND NOT EXISTS(SELECT 1 + FROM user_custom_fields + WHERE name = :new_user_tag_id) + SQL + + ActiveRecord::Base.transaction do + ActiveRecord::Base.exec_sql(sql, new_id: new_id, old_id: old_id, tags_field_name: TAGS_FIELD_NAME) + TopicCustomField.delete_all(name: TAGS_FIELD_NAME, value: old_id) + ActiveRecord::Base.exec_sql(user_sql, new_user_tag_id: notification_key(new_id), + old_user_tag_id: notification_key(old_id)) + UserCustomField.delete_all(name: notification_key(old_id)) + StaffActionLogger.new(current_user).log_custom('renamed_tag', previous_value: old_id, new_value: new_id) + end + end + + def self.top_tags(limit_arg=nil) + # TODO: cache + # TODO: need an index for this (name,value) + TopicCustomField.where(name: TAGS_FIELD_NAME) + .group(:value) + .limit(limit_arg || SiteSetting.max_tags_in_filter_list) + .order('COUNT(value) DESC') + .count + .map {|name, count| name} + end + + def self.muted_tags(user) + return [] unless user + UserCustomField.where(user_id: user.id, value: TopicUser.notification_levels[:muted]).pluck(:name).map { |x| x[0,17] == "tags_notification" ? x[18..-1] : nil}.compact + end +end diff --git a/lib/guardian.rb b/lib/guardian.rb index 5821e6c037..1a6c9d1375 100644 --- a/lib/guardian.rb +++ b/lib/guardian.rb @@ -276,6 +276,18 @@ class Guardian UserExport.where(user_id: @user.id, created_at: (Time.zone.now.beginning_of_day..Time.zone.now.end_of_day)).count == 0 end + def can_create_tag? + user && user.has_trust_level?(SiteSetting.min_trust_to_create_tag.to_i) + end + + def can_tag_topics? + user && user.has_trust_level?(SiteSetting.min_trust_level_to_tag_topics.to_i) + end + + def can_admin_tags? + is_staff? + end + private def is_my_own?(obj) diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb index 7fb3735de1..cccc8aa677 100644 --- a/lib/plugin/instance.rb +++ b/lib/plugin/instance.rb @@ -30,6 +30,10 @@ class Plugin::Instance [].tap { |plugins| # also follows symlinks - http://stackoverflow.com/q/357754 Dir["#{parent_path}/**/*/**/plugin.rb"].sort.each do |path| + + # tagging is included in core, so don't load it + next if path =~ /discourse-tagging/ + source = File.read(path) metadata = Plugin::Metadata.parse(source) plugins << self.new(metadata, path) diff --git a/lib/post_creator.rb b/lib/post_creator.rb index 9f81977ec5..bd0d67295a 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -147,6 +147,7 @@ class PostCreator track_latest_on_category enqueue_jobs BadgeGranter.queue_badge_grant(Badge::Trigger::PostRevision, post: @post) + auto_notify_for_tags trigger_after_events(@post) @@ -437,6 +438,15 @@ class PostCreator PostJobsEnqueuer.new(@post, @topic, new_topic?, {import_mode: @opts[:import_mode]}).enqueue_jobs end + def auto_notify_for_tags + tags = DiscourseTagging.tags_for_saving(@opts[:tags], @guardian) + if tags.present? + @topic.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags) + @topic.save + DiscourseTagging.auto_notify_for(tags, @topic) + end + end + def new_topic? @opts[:topic_id].blank? end diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb index 093b55c924..d1fb4bcea8 100644 --- a/lib/post_revisor.rb +++ b/lib/post_revisor.rb @@ -72,6 +72,54 @@ class PostRevisor tc.check_result(tc.topic.change_category_to_id(category_id)) end + track_topic_field(:tags_empty_array) do |tc, val| + if val.present? + unless tc.guardian.is_staff? + old_tags = tc.topic.tags || [] + staff_tags = DiscourseTagging.staff_only_tags(old_tags) + if staff_tags.present? + tc.topic.errors[:base] << I18n.t("tags.staff_tag_remove_disallowed", tag: staff_tags.join(" ")) + tc.check_result(false) + next + end + end + + tc.record_change(DiscourseTagging::TAGS_FIELD_NAME, tc.topic.custom_fields[DiscourseTagging::TAGS_FIELD_NAME], nil) + tc.topic.custom_fields.delete(DiscourseTagging::TAGS_FIELD_NAME) + end + end + + track_topic_field(:tags) do |tc, tags| + if tags.present? && tc.guardian.can_tag_topics? + tags = DiscourseTagging.tags_for_saving(tags, tc.guardian) + old_tags = tc.topic.tags || [] + + new_tags = tags - old_tags + removed_tags = old_tags - tags + + unless tc.guardian.is_staff? + staff_tags = DiscourseTagging.staff_only_tags(new_tags) + if staff_tags.present? + tc.topic.errors[:base] << I18n.t("tags.staff_tag_disallowed", tag: staff_tags.join(" ")) + tc.check_result(false) + next + end + + staff_tags = DiscourseTagging.staff_only_tags(removed_tags) + if staff_tags.present? + tc.topic.errors[:base] << I18n.t("tags.staff_tag_remove_disallowed", tag: staff_tags.join(" ")) + tc.check_result(false) + next + end + end + + tc.record_change(DiscourseTagging::TAGS_FIELD_NAME, tc.topic.custom_fields[DiscourseTagging::TAGS_FIELD_NAME], tags) + tc.topic.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags) + + DiscourseTagging.auto_notify_for(new_tags, tc.topic) if new_tags.present? + end + end + # AVAILABLE OPTIONS: # - revised_at: changes the date of the revision # - force_new_version: bypass ninja-edit window diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index bc804a1613..0c35f70b0a 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -67,6 +67,23 @@ module PrettyText } end end + + def category_tag_hashtag_lookup(text) + tag_postfix = '::tag' + is_tag = text =~ /#{tag_postfix}$/ + + if !is_tag && category = Category.query_from_hashtag_slug(text) + [category.url_with_id, text] + elsif is_tag && tag = TopicCustomField.find_by(name: TAGS_FIELD_NAME, value: text.gsub!("#{tag_postfix}", '')) + ["#{Discourse.base_url}/tags/#{tag.value}", text] + else + nil + end + end + + DiscourseEvent.on(:markdown_context) do |context| + context.eval('opts["categoryHashtagLookup"] = function(c){return helpers.category_tag_hashtag_lookup(c);}') + end end @mutex = Mutex.new diff --git a/lib/search.rb b/lib/search.rb index 5bfd9d4e2e..224c14c35c 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -313,6 +313,17 @@ class Search end end + advanced_filter(/tags?:([a-zA-Z0-9,\-_]+)/) do |posts, match| + tags = match.split(",") + + posts.where("topics.id IN ( + SELECT tc.topic_id + FROM topic_custom_fields tc + WHERE tc.name = '#{DiscourseTagging::TAGS_FIELD_NAME}' AND + tc.value in (?) + )", tags) + end + private diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb index d0548885d3..53409a1837 100644 --- a/lib/topic_creator.rb +++ b/lib/topic_creator.rb @@ -23,6 +23,12 @@ class TopicCreator # so we fire the validation event after # this allows us to add errors valid = topic.valid? + + # not sure where this should go + if !@guardian.is_staff? && staff_only = DiscourseTagging.staff_only_tags(@opts[:tags]) + topic.errors[:base] << I18n.t("tags.staff_tag_disallowed", tag: staff_only.join(" ")) + end + DiscourseEvent.trigger(:after_validate_topic, topic, self) valid &&= topic.errors.empty? diff --git a/lib/topic_query.rb b/lib/topic_query.rb index 1c061107c4..f14c3dca42 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -308,6 +308,7 @@ class TopicQuery result = default_results(options) result = remove_muted_topics(result, @user) unless options && options[:state] == "muted".freeze result = remove_muted_categories(result, @user, exclude: options[:category]) + result = remove_muted_tags(result, @user, options) # plugins can remove topics here: self.class.results_filter_callbacks.each do |filter_callback| @@ -334,6 +335,7 @@ class TopicQuery result = TopicQuery.new_filter(default_results(options.reverse_merge(:unordered => true)), @user.user_option.treat_as_new_topic_start_date) result = remove_muted_topics(result, @user) result = remove_muted_categories(result, @user, exclude: options[:category]) + result = remove_muted_tags(result, @user, options) self.class.results_filter_callbacks.each do |filter_callback| result = filter_callback.call(:new, result, @user, options) @@ -562,6 +564,36 @@ class TopicQuery list end + def remove_muted_tags(list, user, opts=nil) + if user.nil? || !SiteSetting.tagging_enabled || !SiteSetting.remove_muted_tags_from_latest + list + else + muted_tags = DiscourseTagging.muted_tags(user) + if muted_tags.empty? + list + else + showing_tag = if opts[:filter] + f = opts[:filter].split('/') + f[0] == 'tags' ? f[1] : nil + else + nil + end + + if muted_tags.include?(showing_tag) + list # if viewing the topic list for a muted tag, show all the topics + else + arr = muted_tags.map{ |z| "'#{z}'" }.join(',') + list.where("EXISTS ( + SELECT 1 + FROM topic_custom_fields tcf + WHERE tcf.name = 'tags' + AND tcf.value NOT IN (#{arr}) + AND tcf.topic_id = topics.id + ) OR NOT EXISTS (select 1 from topic_custom_fields tcf where tcf.name = 'tags' and tcf.topic_id = topics.id)") + end + end + end + end def new_messages(params) diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb index 541d283a1a..36c17f228e 100644 --- a/lib/topics_bulk_action.rb +++ b/lib/topics_bulk_action.rb @@ -11,7 +11,7 @@ class TopicsBulkAction def self.operations @operations ||= %w(change_category close archive change_notification_level reset_read dismiss_posts delete unlist archive_messages - move_messages_to_inbox) + move_messages_to_inbox change_tags) end def self.register_operation(name, &block) @@ -130,6 +130,23 @@ class TopicsBulkAction end end + def change_tags + tags = @operation[:tags] + tags = DiscourseTagging.tags_for_saving(tags, guardian) if tags.present? + + topics.each do |t| + if guardian.can_edit?(t) + if tags.present? + t.custom_fields.update(DiscourseTagging::TAGS_FIELD_NAME => tags) + t.save + DiscourseTagging.auto_notify_for(tags, t) + else + t.custom_fields.delete(DiscourseTagging::TAGS_FIELD_NAME) + end + end + end + end + def guardian @guardian ||= Guardian.new(@user) end From 83c092af643fee54f50e8bb400e9c230a92ff30d Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 27 Apr 2016 12:23:29 -0400 Subject: [PATCH 062/125] fix duplicate i18n key --- config/locales/server.de.yml | 3 +-- config/locales/server.en.yml | 3 +-- config/locales/server.es.yml | 3 +-- config/locales/server.fa_IR.yml | 3 +-- config/locales/server.fi.yml | 3 +-- config/locales/server.fr.yml | 3 +-- config/locales/server.pl_PL.yml | 3 +-- config/locales/server.pt_BR.yml | 3 +-- config/locales/server.tr_TR.yml | 3 +-- config/locales/server.zh_CN.yml | 3 +-- 10 files changed, 10 insertions(+), 20 deletions(-) diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index baf013524a..776b036fed 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -174,6 +174,7 @@ de: group_mentions: "Neueste Nennungen von %{group_name}" user_posts: "Neueste Beiträge von @%{username}" user_topics: "Neueste Themen von @%{username}" + tag: "Getaggte Themen" too_late_to_edit: "Dieser Beitrag wurde vor zu langer Zeit erstellt. Er kann nicht mehr bearbeitet oder gelöscht werden." revert_version_same: "Die aktuelle Version entspricht der Version, zu der du zurückkehren möchtest." excerpt_image: "Bild" @@ -2065,5 +2066,3 @@ de: staff_tag_disallowed: "Das Tag \"%{tag}\" kann nur von Mitarbeitern hinzugefügt werden." staff_tag_remove_disallowed: "Das Tag \"%{tag}\" kann nur von Mitarbeitern entfernt werden." rss_by_tag: "Themen getaggt mit %{tag}" - rss_description: - tag: "Getaggte Themen" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index d656359e39..96b3031250 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -212,6 +212,7 @@ en: group_mentions: "Latest mentions from %{group_name}" user_posts: "Latest posts by @%{username}" user_topics: "Latest topics by @%{username}" + tag: "Tagged topics" too_late_to_edit: "That post was created too long ago. It can no longer be edited or deleted." revert_version_same: "The current version is same as the version you are trying to revert to." @@ -3025,5 +3026,3 @@ en: staff_tag_disallowed: "The tag \"%{tag}\" may only be applied by staff." staff_tag_remove_disallowed: "The tag \"%{tag}\" may only be removed by staff." rss_by_tag: "Topics tagged %{tag}" - rss_description: - tag: "Tagged topics" diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 49cb33a84c..f2a7d852cc 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -174,6 +174,7 @@ es: group_mentions: "Últimas menciones de %{group_name}" user_posts: "Posts recientes por @%{username}" user_topics: "Temas recientes por @%{username}" + tag: "Temas etiquetados" too_late_to_edit: "Ese post fue publicado hace demasiado tiempo. No puede ser editado ni eliminado." revert_version_same: "La versión actual es la misma que la versión a la que intentas volver." excerpt_image: "imagen" @@ -2245,5 +2246,3 @@ es: staff_tag_disallowed: "La etiqueta \"%{tag}\" sólo puede ser aplicada por los administradores." staff_tag_remove_disallowed: "La etiqueta \"%{tag}\" sólo puede ser eliminada por los administradores." rss_by_tag: "Temas con la etiqueta %{tag}" - rss_description: - tag: "Temas etiquetados" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index 34a3cfcf43..a94df297f5 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -134,6 +134,7 @@ fa_IR: latest: "آخرین ارسال ها" hot: "جستارهای داغ" posts: "آخرین نوشته‌ها" + tag: "موضوعات برچسب خورد" too_late_to_edit: "ارسالی مورد نظر مربوط به زمان بسیار گذشته می باشد. امکان ویرایش و حذف آن وجود ندارد." excerpt_image: "تصویر" queue: @@ -1296,5 +1297,3 @@ fa_IR: errors: <<: *errors rss_by_tag: "موضوعات برچسب خورد %{tag}" - rss_description: - tag: "موضوعات برچسب خورد" diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 9770a1a231..71f1642a11 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -172,6 +172,7 @@ fi: private_posts: "Uusimmat yksityisviestit" group_posts: "Uusimmat viestit ryhmässä %{group_name}" group_mentions: "Uusimmat maininnat ryhmässä %{group_name}" + tag: "Tagatut aiheet" too_late_to_edit: "Tämä viesti luotiin liian kauan sitten. Sitä ei voi enää muokata tai poistaa." revert_version_same: "Nykyinen revisio on sama, kuin jonka yrität palauttaa." excerpt_image: "kuva" @@ -2275,5 +2276,3 @@ fi: errors: <<: *errors rss_by_tag: "Aiheet tagattu %{tag}" - rss_description: - tag: "Tagatut aiheet" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index b6900673de..d3881ecff8 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -174,6 +174,7 @@ fr: group_mentions: "Mentions récentes par %{username}" user_posts: "Derniers messages par @%{username}" user_topics: "Sujets récents par @%{username}" + tag: "Sujet tagués" too_late_to_edit: "Ce message a été créé il y a trop longtemps. Il ne peut plus être modifié ou supprimé." revert_version_same: "La version actuelle est la même que la version vers laquelle vous essayez de revenir." excerpt_image: "image" @@ -2198,5 +2199,3 @@ fr: errors: <<: *errors rss_by_tag: "Sujets portant le tag %{tag}" - rss_description: - tag: "Sujet tagués" diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index b91f1c7ffa..729972cb9c 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -137,6 +137,7 @@ pl_PL: latest: "Ostatnie wątki" hot: "Popularne wątki" posts: "Aktualne wpisy" + tag: "Otagowane tematy" too_late_to_edit: "Ten wpis został utworzony zbyt dawno. Nie może być edytowany ani usunięty." excerpt_image: "zdjęcie" queue: @@ -1221,5 +1222,3 @@ pl_PL: errors: <<: *errors rss_by_tag: "Tematy otagowane jako %{tag}" - rss_description: - tag: "Otagowane tematy" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index e7882be428..5c22281a6e 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -170,6 +170,7 @@ pt_BR: private_posts: "Últimas mensagens privadas" user_posts: "Últimos posts por @%{username}" user_topics: "Últimos tópicos por @%{username}" + tag: "Tópicos com tag" too_late_to_edit: "Essa mensagem foi criada há muito tempo. Ela não pode mais ser editada ou apagada." excerpt_image: "imagem" queue: @@ -1533,5 +1534,3 @@ pt_BR: staff_tag_disallowed: "A tag \"%{tag}\" só pode ser aplicada pela moderação." staff_tag_remove_disallowed: "A tag \"%{tag}\" só pode ser removida pela moderação." rss_by_tag: "Tópicos com a tag %{tag}" - rss_description: - tag: "Tópicos com tag" diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index a31e114a62..0792e09cc6 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -145,6 +145,7 @@ tr_TR: top: "En iyi konular" posts: "Son gönderiler" private_posts: "Son özel mesajlar" + tag: "Etiketlenmiş konular" too_late_to_edit: "Gönderi çok uzun zaman önce oluşturulmuş. Artık düzenlenemez ya da silinemez. " excerpt_image: "resim" queue: @@ -1457,5 +1458,3 @@ tr_TR: errors: <<: *errors rss_by_tag: "Konu %{tag} ile etiketlenmiştir." - rss_description: - tag: "Etiketlenmiş konular" diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index ec818080b0..44a3268b24 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -162,6 +162,7 @@ zh_CN: group_mentions: "%{group_name}组最近的提及" user_posts: "最新贴子由@%{username}发表" user_topics: "最新主题由@%{username}发表" + tag: "加标签的主题" too_late_to_edit: "这个主题在很早之前创建。不能被编辑或者被删除。" revert_version_same: "目前的版本和你想要回退至的版本一样。" excerpt_image: "图片" @@ -2468,5 +2469,3 @@ zh_CN: staff_tag_disallowed: "标签\"%{tag}\"只可以由职员标记。" staff_tag_remove_disallowed: "标签\"%{tag}\"只可以由职员删除。" rss_by_tag: "%{tag}标签的主题" - rss_description: - tag: "加标签的主题" From 43bbc425e8472f6cff67255b6c81615beb1cf7dc Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 27 Apr 2016 13:02:31 -0400 Subject: [PATCH 063/125] FIX: Support for extra admin links in the hamburger --- .../javascripts/discourse/widgets/hamburger-menu.js.es6 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 index 53b3bc14f8..2d4c22323f 100644 --- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 @@ -1,4 +1,4 @@ -import { createWidget } from 'discourse/widgets/widget'; +import { createWidget, applyDecorators } from 'discourse/widgets/widget'; import { h } from 'virtual-dom'; export default createWidget('hamburger-menu', { @@ -141,7 +141,10 @@ export default createWidget('hamburger-menu', { } if (currentUser && currentUser.staff) { - results.push(this.attach('menu-links', { contents: () => this.adminLinks() })); + results.push(this.attach('menu-links', { contents: () => { + const extraLinks = applyDecorators(this, 'admin-links', this.attrs, this.state) || []; + return this.adminLinks().concat(extraLinks); + }})); } results.push(this.attach('menu-links', { contents: () => this.generalLinks() })); From 02f771e66ead3fb6e861bfa1fd41d8c65d10ab1d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 27 Apr 2016 13:16:51 -0400 Subject: [PATCH 064/125] Add a widget setting for the home logo url --- .../discourse/widgets/home-logo.js.es6 | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 index 408b7da13b..4f95c85a98 100644 --- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 +++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 @@ -1,11 +1,15 @@ -import DiscourseURL from 'discourse/lib/url'; import { createWidget } from 'discourse/widgets/widget'; import { h } from 'virtual-dom'; import { iconNode } from 'discourse/helpers/fa-icon'; +import interceptClick from 'discourse/lib/intercept-click'; export default createWidget('home-logo', { tagName: 'div.title', + settings: { + href: '/' + }, + logo() { const { siteSettings } = this; const mobileView = this.site.mobileView; @@ -33,15 +37,8 @@ export default createWidget('home-logo', { }, html() { - return h('a', { attributes: { href: "/", 'data-auto-route': true } }, this.logo()); + return h('a', { attributes: { href: this.settings.href } }, this.logo()); }, - click(e) { - if (e.shiftKey || e.metaKey || e.ctrlKey || e.button !== 0) { return true; } - - e.preventDefault(); - - DiscourseURL.routeTo("/"); - return false; - } + click: interceptClick }); From 1c90b8dd76f98e1a917a94c164ba2a9f4455b9e9 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 27 Apr 2016 13:53:51 -0400 Subject: [PATCH 065/125] FIX: Search menu would sometimes forget the context --- .../javascripts/discourse/widgets/search-menu.js.es6 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6 index c03f1a99e5..e17c96e8e8 100644 --- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6 @@ -60,7 +60,7 @@ export default createWidget('search-menu', { fullSearchUrl() { const state = this.state; - const contextEnabled = this.attrs.contextEnabled; + const contextEnabled = state.contextEnabled; const ctx = contextEnabled ? this.searchContext() : null; const type = Ember.get(ctx, 'type'); @@ -84,7 +84,7 @@ export default createWidget('search-menu', { panelContents() { const { state } = this; - const contextEnabled = this.attrs.contextEnabled; + const contextEnabled = state.contextEnabled; const results = [this.attach('search-term', { value: state.term, contextEnabled }), this.attach('search-context', { contextEnabled })]; @@ -114,7 +114,9 @@ export default createWidget('search-menu', { return this._searchContext; }, - html() { + html(attrs, state) { + state.contextEnabled = attrs.contextEnabled; + return this.attach('menu-panel', { maxWidth: 500, contents: () => this.panelContents() }); }, From 2f911d9435afbd8f97c4567e7586a55e5207c43f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 27 Apr 2016 14:03:45 -0400 Subject: [PATCH 066/125] FIX: Broken test, `data-auto-route` is no longer needed --- test/javascripts/widgets/home-logo-test.js.es6 | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6 index 9c4e678058..e2acb50382 100644 --- a/test/javascripts/widgets/home-logo-test.js.es6 +++ b/test/javascripts/widgets/home-logo-test.js.es6 @@ -18,7 +18,6 @@ widgetTest('basics', { test(assert) { assert.ok(this.$('.title').length === 1); - assert.ok(this.$('a[data-auto-route]').length === 1); assert.ok(this.$('img#site-logo.logo-big').length === 1); assert.equal(this.$('#site-logo').attr('src'), bigLogo); @@ -52,8 +51,6 @@ widgetTest('no logo', { }, test(assert) { - assert.ok(this.$('a[data-auto-route]').length === 1); - assert.ok(this.$('h2#site-text-logo.text-logo').length === 1); assert.equal(this.$('#site-text-logo').text(), title); } From 55ba81494f879583a7e14d53c46c5627300d8853 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 27 Apr 2016 14:56:04 -0400 Subject: [PATCH 067/125] FIX: Allow `:+1:` and `:-1:` to work even though not in emoji.json --- app/models/emoji.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/models/emoji.rb b/app/models/emoji.rb index f6cc04b277..9ff96bebc8 100644 --- a/app/models/emoji.rb +++ b/app/models/emoji.rb @@ -56,7 +56,7 @@ class Emoji def self.create_from_db_item(emoji) name = emoji["name"] - filename = "#{name}.png" + filename = "#{emoji['filename'] || name}.png" Emoji.new.tap do |e| e.name = name e.url = "/images/emoji/#{SiteSetting.emoji_set}/#{filename}" @@ -90,7 +90,14 @@ class Emoji end def self.db - @db ||= File.open(db_file, "r:UTF-8") { |f| JSON.parse(f.read) } + return @db if @db + @db = File.open(db_file, "r:UTF-8") { |f| JSON.parse(f.read) } + + # Small tweak to `emoji.json` from Emoji one + @db['emojis'] << {"code" => "1f44d", "name" => "+1", "filename" => "thumbsup"} + @db['emojis'] << {"code" => "1f44e", "name" => "-1", "filename" => "thumbsdown"} + + @db end def self.load_standard From d89fb6e83ef8b5f37b25673e80c964867f3c20fd Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 27 Apr 2016 15:06:55 -0400 Subject: [PATCH 068/125] Better warning message if `defaultState` is used improperly --- app/assets/javascripts/discourse/widgets/widget.js.es6 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6 index 09c2deac3f..31c1c3fa33 100644 --- a/app/assets/javascripts/discourse/widgets/widget.js.es6 +++ b/app/assets/javascripts/discourse/widgets/widget.js.es6 @@ -125,8 +125,11 @@ export default class Widget { this.key = this.buildKey ? this.buildKey(attrs) : null; // Helps debug widgets - if (Ember.Test) { - if (Object.keys(this.defaultState(attrs)).length > 0 && !this.key) { + if (Ember.testing) { + const ds = this.defaultState(attrs); + if (typeof ds !== "object") { + Ember.warn(`defaultState must return an object`); + } else if (Object.keys(ds).length > 0 && !this.key) { Ember.warn(`you need a key when using state ${this.name}`); } } From 8ec8f623118f07ec52f72316112ce5750525d0db Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 14:25:35 -0700 Subject: [PATCH 069/125] Update INSTALL-cloud.md --- docs/INSTALL-cloud.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 8285c8efe2..5f1b5646f4 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -78,18 +78,12 @@ If you need to change or fix your email settings after bootstrapping, you must e # Start Discourse -Bootstrapping takes between **2-8 minutes** to set up your Discourse. After that completes, start Discourse: - - ./launcher start app - - - -Congratulations! You just built your very own Discourse! - -Your Discourse should be accessible in your web browser via the domain name `discourse.example.com` you entered earlier, provided you configured DNS. If not, you can visit the server IP directly, e.g. `http://192.168.1.1`. +Bootstrapping takes between **2-8 minutes** to set up your Discourse. Your Discourse should be accessible in your web browser via the domain name `discourse.example.com` you entered earlier, provided you configured DNS. If not, you can visit the server IP directly, e.g. `http://192.168.1.1`. +Congratulations! You just built your very own Discourse! + # Register New Account and Become Admin Register a new admin account using one of the email addresses you entered before bootstrapping. From bfda797313ed748ef21216a693b58d225a4fbb6f Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 14:45:41 -0700 Subject: [PATCH 070/125] Update INSTALL-cloud.md --- docs/INSTALL-cloud.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 5f1b5646f4..99c75885d1 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -62,7 +62,7 @@ Answer the following questions when prompted: SMTP user name? [postmaster@discourse.example.com]: SMTP password? []: -This will generate an `app.yml` configuration file on your behalf, and then kick off bootstrap. +This will generate an `app.yml` configuration file on your behalf, and then kicks off bootstrap. Bootstrapping takes between **2-8 minutes** to set up your Discourse. # Email Is Important @@ -78,7 +78,7 @@ If you need to change or fix your email settings after bootstrapping, you must e # Start Discourse -Bootstrapping takes between **2-8 minutes** to set up your Discourse. Your Discourse should be accessible in your web browser via the domain name `discourse.example.com` you entered earlier, provided you configured DNS. If not, you can visit the server IP directly, e.g. `http://192.168.1.1`. + Once bootstrapping is complete, your Discourse should be accessible in your web browser via the domain name `discourse.example.com` you entered earlier, provided you configured DNS. If not, you can visit the server IP directly, e.g. `http://192.168.1.1`. From a59cbae77a5a7fdc53e4fee570e891d51bd8c7a9 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 16:01:36 -0700 Subject: [PATCH 071/125] remove swap reference as discourse-setup does that for you now --- docs/INSTALL-cloud.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 99c75885d1..81951fa6a0 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -26,11 +26,6 @@ You will be asked for permission to connect, type `yes`, then enter the root pas -# Set up Swap (if needed) - -- If you're using the minimum 1 GB install, you *must* [set up a swap file](https://meta.discourse.org/t/create-a-swapfile-for-your-linux-server/13880). -- If you're using 2 GB+ memory, you can probably get by without a swap file. - # Install Docker / Git wget -qO- https://get.docker.com/ | sh @@ -46,7 +41,7 @@ Create a `/var/discourse` folder, clone the [Official Discourse Docker Image][dd git clone https://github.com/discourse/discourse_docker.git /var/discourse cd /var/discourse -You will need to be root through the rest of the bootstrap process. +You will need to be root through the rest of the setup and bootstrap process. # Edit Discourse Configuration From 98afc8be20e92ce94ec6f45f466e3f1191511ed7 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 16:03:43 -0700 Subject: [PATCH 072/125] add Git install page --- docs/INSTALL-cloud.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 81951fa6a0..c89bad8922 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -30,7 +30,7 @@ You will be asked for permission to connect, type `yes`, then enter the root pas wget -qO- https://get.docker.com/ | sh -This command installs the latest versions of Docker and Git on your server. Alternately, you can manually install Git and the [Docker package for your OS](https://docs.docker.com/installation/). +This command installs the latest versions of Docker and Git on your server. Alternately, you can manually [install Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) and the [Docker package for your OS](https://docs.docker.com/installation/). # Install Discourse From 18501049e2adc3ee16889d960075b93c955dcbcb Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 16:50:46 -0700 Subject: [PATCH 073/125] better SSH screenshot --- docs/INSTALL-cloud.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index c89bad8922..237069ab1b 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -24,7 +24,7 @@ Replace `192.168.1.1` with the IP address of your server. You will be asked for permission to connect, type `yes`, then enter the root password from the email DigitalOcean sent you when the server was set up. You may be prompted to change the root password, too. - + # Install Docker / Git From 9ee315bd7d58b1d6de8e7cf97f215427ddb9fe3b Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 17:10:37 -0700 Subject: [PATCH 074/125] Update INSTALL-cloud.md --- docs/INSTALL-cloud.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 237069ab1b..85a5e72176 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -67,9 +67,9 @@ This will generate an `app.yml` configuration file on your behalf, and then kick - No existing mail server? Check out our [**Recommended Email Providers for Discourse**][mailconfig]. -- For proper email deliverability, you must set correct SPF and DKIM records in your DNS. See your email provider instructions for specifics. +- For proper email deliverability, add valid SPF and DKIM records in your DNS. See your email provider instructions for specifics. -If you need to change or fix your email settings after bootstrapping, you must edit your `app.yml` file and `./launcher rebuild app`, otherwise your changes will not take effect. +If you need to change or fix your email settings after bootstrapping, edit your `app.yml` file and `./launcher rebuild app`, otherwise your changes will not take effect. # Start Discourse From 5a9fac4c5435374724b9d471728fd8464ec6d8ba Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 17:11:08 -0700 Subject: [PATCH 075/125] Update INSTALL-cloud.md --- docs/INSTALL-cloud.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 85a5e72176..888c3ae42f 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -16,12 +16,10 @@ Create your new Droplet. You will receive an email with the root password to you # Access Your Cloud Server -Connect to your server via SSH, or use [Putty][put] on Windows: +Connect to your server via its IP address with SSH, or use [Putty][put] on Windows: ssh root@192.168.1.1 -Replace `192.168.1.1` with the IP address of your server. - You will be asked for permission to connect, type `yes`, then enter the root password from the email DigitalOcean sent you when the server was set up. You may be prompted to change the root password, too. From 8837906907d9b93135b670475244d782b03928fc Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Wed, 27 Apr 2016 20:04:49 -0700 Subject: [PATCH 076/125] Update INSTALL-cloud.md --- docs/INSTALL-cloud.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 888c3ae42f..64e9f42d7c 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -75,8 +75,6 @@ If you need to change or fix your email settings after bootstrapping, edit your -Congratulations! You just built your very own Discourse! - # Register New Account and Become Admin Register a new admin account using one of the email addresses you entered before bootstrapping. From 2a2b0d780346542d8a8389ab5cc09110269c7149 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 28 Apr 2016 22:03:28 +0530 Subject: [PATCH 077/125] FIX: do not raise error if tertiary color not found while sending digests --- app/views/user_notifications/digest.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index 3d7471f731..042a332bf4 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -74,5 +74,5 @@
    <%=raw(t 'user_notifications.digest.unsubscribe', site_link: html_site_link(@anchor_color), - unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url_no_prefix, key: @unsubscribe_key), {:style=>'color: #' + @anchor_color })) %> + unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url_no_prefix, key: @unsubscribe_key), {:style=>"color: ##{@anchor_color}"})) %>
    From 04ec679d8267c1c0dd0c887bda5d03566e20de4f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 28 Apr 2016 12:14:50 -0400 Subject: [PATCH 078/125] Fixes some deprecations: - LoadMore as a Mixin for discovery, groups - Removed Views for discovery, groups --- .../discovery-categories.js.es6 | 4 +- .../discovery-topics-list.js.es6} | 48 ++++++++-------- .../components/group-post-stream.js.es6 | 8 +++ .../controllers/discovery/topics.js.es6 | 5 +- .../discourse/controllers/group-index.js.es6 | 27 +++++++++ .../discourse/controllers/group/index.js.es6 | 28 ---------- .../controllers/group/members.js.es6 | 4 +- .../controllers/group/mentions.js.es6 | 3 - .../discourse/controllers/group/topics.js.es6 | 3 - .../discourse/lib/app-events.js.es6 | 24 -------- .../discourse/lib/click-track.js.es6 | 3 +- .../discourse/lib/intercept-click.js.es6 | 6 +- .../discourse/mixins/url-refresh.js.es6 | 18 +++--- .../discourse/routes/group-index.js.es6 | 34 ++++++++---- .../discourse/routes/group-members.js.es6 | 1 - .../discourse/routes/group-mentions.js.es6 | 12 +--- .../discourse/routes/group-messages.js.es6 | 12 +--- .../discourse/routes/group-topics.js.es6 | 12 +--- .../components/group-post-stream.js.hbs | 16 +++--- .../templates/discovery/categories.hbs | 4 +- .../discourse/templates/discovery/topics.hbs | 34 ++++++------ .../discourse/templates/group-index.hbs | 1 + .../discourse/templates/group/index.hbs | 1 - .../discourse/templates/group/members.hbs | 55 ++++++++++--------- .../discourse/templates/group/mentions.hbs | 1 - .../discourse/templates/group/messages.hbs | 1 - .../discourse/templates/group/topics.hbs | 1 - .../discourse/views/discovery-top.js.es6 | 4 -- .../discourse/views/group-index.js.es6 | 6 -- .../discourse/views/group-members.js.es6 | 6 -- .../discourse/views/group-mentions.js.es6 | 6 -- .../discourse/views/group-topics.js.es6 | 6 -- .../javascripts/discourse/views/share.js.es6 | 3 +- .../javascripts/discourse/views/topic.js.es6 | 9 ++- .../discourse/views/user-card.js.es6 | 5 +- .../discourse/widgets/home-logo.js.es6 | 11 +++- .../javascripts/discourse/widgets/link.js.es6 | 3 +- .../widgets/notification-item.js.es6 | 3 +- 38 files changed, 191 insertions(+), 237 deletions(-) rename app/assets/javascripts/discourse/{views => components}/discovery-categories.js.es6 (82%) rename app/assets/javascripts/discourse/{views/discovery-topics.js.es6 => components/discovery-topics-list.js.es6} (68%) create mode 100644 app/assets/javascripts/discourse/components/group-post-stream.js.es6 create mode 100644 app/assets/javascripts/discourse/controllers/group-index.js.es6 delete mode 100644 app/assets/javascripts/discourse/controllers/group/index.js.es6 delete mode 100644 app/assets/javascripts/discourse/controllers/group/mentions.js.es6 delete mode 100644 app/assets/javascripts/discourse/controllers/group/topics.js.es6 create mode 100644 app/assets/javascripts/discourse/templates/group-index.hbs delete mode 100644 app/assets/javascripts/discourse/templates/group/index.hbs delete mode 100644 app/assets/javascripts/discourse/templates/group/mentions.hbs delete mode 100644 app/assets/javascripts/discourse/templates/group/messages.hbs delete mode 100644 app/assets/javascripts/discourse/templates/group/topics.hbs delete mode 100644 app/assets/javascripts/discourse/views/discovery-top.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/group-index.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/group-members.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/group-mentions.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/group-topics.js.es6 diff --git a/app/assets/javascripts/discourse/views/discovery-categories.js.es6 b/app/assets/javascripts/discourse/components/discovery-categories.js.es6 similarity index 82% rename from app/assets/javascripts/discourse/views/discovery-categories.js.es6 rename to app/assets/javascripts/discourse/components/discovery-categories.js.es6 index ee4b13d7dc..d4b969b56d 100644 --- a/app/assets/javascripts/discourse/views/discovery-categories.js.es6 +++ b/app/assets/javascripts/discourse/components/discovery-categories.js.es6 @@ -3,7 +3,9 @@ import { on } from 'ember-addons/ember-computed-decorators'; const CATEGORIES_LIST_BODY_CLASS = "categories-list"; -export default Ember.View.extend(UrlRefresh, { +export default Ember.Component.extend(UrlRefresh, { + classNames: ['contents'], + @on("didInsertElement") addBodyClass() { $('body').addClass(CATEGORIES_LIST_BODY_CLASS); diff --git a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 similarity index 68% rename from app/assets/javascripts/discourse/views/discovery-topics.js.es6 rename to app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 index ef5e3712c8..d5a67e3f63 100644 --- a/app/assets/javascripts/discourse/views/discovery-topics.js.es6 +++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 @@ -1,27 +1,15 @@ -import UrlRefresh from 'discourse/mixins/url-refresh'; -import LoadMore from "discourse/mixins/load-more"; import { on, observes } from "ember-addons/ember-computed-decorators"; +import LoadMore from "discourse/mixins/load-more"; +import UrlRefresh from 'discourse/mixins/url-refresh'; -export default Ember.View.extend(LoadMore, UrlRefresh, { +const DiscoveryTopicsListComponent = Ember.Component.extend(UrlRefresh, LoadMore, { + _viaComponent: true, + + classNames: ['contents'], eyelineSelector: '.topic-list-item', - actions: { - loadMore() { - const self = this; - Discourse.notifyTitle(0); - this.get('controller').loadMoreTopics().then(hasMoreResults => { - Ember.run.schedule('afterRender', () => self.saveScrollPosition()); - if (!hasMoreResults) { - this.get('eyeline').flushRest(); - } else if ($(window).height() >= $(document).height()) { - this.send("loadMore"); - } - }); - } - }, - @on("didInsertElement") - @observes("controller.model") + @observes("model") _readjustScrollPosition() { const scrollTo = this.session.get('topicListScrollPosition'); if (scrollTo && scrollTo >= 0) { @@ -31,19 +19,33 @@ export default Ember.View.extend(LoadMore, UrlRefresh, { } }, - @observes("controller.topicTrackingState.incomingCount") + @observes("incomingCount") _updateTitle() { - Discourse.notifyTitle(this.get('controller.topicTrackingState.incomingCount')); + Discourse.notifyTitle(this.get('incomingCount')); }, - // Remember where we were scrolled to saveScrollPosition() { this.session.set('topicListScrollPosition', $(window).scrollTop()); }, - // When the topic list is scrolled scrolled() { this._super(); this.saveScrollPosition(); + }, + + actions: { + loadMore() { + Discourse.notifyTitle(0); + this.get('model').loadMore().then(hasMoreResults => { + Ember.run.schedule('afterRender', () => this.saveScrollPosition()); + if (!hasMoreResults) { + this.get('eyeline').flushRest(); + } else if ($(window).height() >= $(document).height()) { + this.send("loadMore"); + } + }); + } } }); + +export default DiscoveryTopicsListComponent; diff --git a/app/assets/javascripts/discourse/components/group-post-stream.js.es6 b/app/assets/javascripts/discourse/components/group-post-stream.js.es6 new file mode 100644 index 0000000000..fc83f2dbb6 --- /dev/null +++ b/app/assets/javascripts/discourse/components/group-post-stream.js.es6 @@ -0,0 +1,8 @@ +export default Ember.Component.extend({ + actions: { + // TODO: When on Ember 1.13, use a closure action + loadMore() { + this.sendAction('loadMore'); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 index 5e86950634..cc411691c5 100644 --- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 @@ -138,11 +138,8 @@ const controllerOpts = { return I18n.t("topics.none.educate." + split[0], { userPrefsUrl: Discourse.getURL("/users/") + (Discourse.User.currentProp("username_lower")) + "/preferences" }); - }.property('allLoaded', 'model.topics.length'), + }.property('allLoaded', 'model.topics.length') - loadMoreTopics() { - return this.get('model').loadMore(); - } }; Ember.keys(queryParams).forEach(function(p) { diff --git a/app/assets/javascripts/discourse/controllers/group-index.js.es6 b/app/assets/javascripts/discourse/controllers/group-index.js.es6 new file mode 100644 index 0000000000..7a5a5bf98f --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/group-index.js.es6 @@ -0,0 +1,27 @@ +import { fmt } from 'discourse/lib/computed'; + +export default Ember.ArrayController.extend({ + needs: ['group'], + loading: false, + emptyText: fmt('type', 'groups.empty.%@'), + + actions: { + loadMore() { + + if (this.get('loading')) { return; } + this.set('loading', true); + const posts = this.get('model'); + if (posts && posts.length) { + const beforePostId = posts[posts.length-1].get('id'); + const group = this.get('controllers.group.model'); + + const opts = { beforePostId, type: this.get('type') }; + group.findPosts(opts).then(newPosts => { + posts.addObjects(newPosts); + this.set('loading', false); + }); + } + } + } +}); + diff --git a/app/assets/javascripts/discourse/controllers/group/index.js.es6 b/app/assets/javascripts/discourse/controllers/group/index.js.es6 deleted file mode 100644 index 60df6a2cdf..0000000000 --- a/app/assets/javascripts/discourse/controllers/group/index.js.es6 +++ /dev/null @@ -1,28 +0,0 @@ -/** - Handles displaying posts within a group -**/ -export default Ember.ArrayController.extend({ - needs: ['group'], - loading: false, - - actions: { - loadMore: function() { - - if (this.get('loading')) { return; } - this.set('loading', true); - var posts = this.get('model'), - self = this; - if (posts && posts.length) { - var lastPostId = posts[posts.length-1].get('id'), - group = this.get('controllers.group.model'); - - var opts = {beforePostId: lastPostId, type: this.get('type')}; - group.findPosts(opts).then(function(newPosts) { - posts.addObjects(newPosts); - self.set('loading', false); - }); - } - } - } -}); - diff --git a/app/assets/javascripts/discourse/controllers/group/members.js.es6 b/app/assets/javascripts/discourse/controllers/group/members.js.es6 index 246a5f80cd..09c4b9a63f 100644 --- a/app/assets/javascripts/discourse/controllers/group/members.js.es6 +++ b/app/assets/javascripts/discourse/controllers/group/members.js.es6 @@ -1,5 +1,6 @@ import { popupAjaxError } from 'discourse/lib/ajax-error'; import computed from 'ember-addons/ember-computed-decorators'; +import Group from 'discourse/models/group'; export default Ember.Controller.extend({ loading: false, @@ -30,10 +31,7 @@ export default Ember.Controller.extend({ }, loadMore() { - const Group = require('discourse/models/group').default; - if (this.get("loading")) { return; } - // we've reached the end if (this.get("model.members.length") >= this.get("model.user_count")) { return; } this.set("loading", true); diff --git a/app/assets/javascripts/discourse/controllers/group/mentions.js.es6 b/app/assets/javascripts/discourse/controllers/group/mentions.js.es6 deleted file mode 100644 index 81fa5a8ffd..0000000000 --- a/app/assets/javascripts/discourse/controllers/group/mentions.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import IndexController from 'discourse/controllers/group/index'; - -export default IndexController.extend({type: 'mentions'}); diff --git a/app/assets/javascripts/discourse/controllers/group/topics.js.es6 b/app/assets/javascripts/discourse/controllers/group/topics.js.es6 deleted file mode 100644 index 9423350320..0000000000 --- a/app/assets/javascripts/discourse/controllers/group/topics.js.es6 +++ /dev/null @@ -1,3 +0,0 @@ -import IndexController from 'discourse/controllers/group/index'; - -export default IndexController.extend({type: 'topics'}); diff --git a/app/assets/javascripts/discourse/lib/app-events.js.es6 b/app/assets/javascripts/discourse/lib/app-events.js.es6 index 597c21b83d..59257700fd 100644 --- a/app/assets/javascripts/discourse/lib/app-events.js.es6 +++ b/app/assets/javascripts/discourse/lib/app-events.js.es6 @@ -1,25 +1 @@ - -var id = 1; -function newKey() { - return "_view_app_event_" + (id++); -} - -function createViewListener(eventName, cb) { - var extension = {}; - extension[newKey()] = function() { - this.appEvents.on(eventName, this, cb); - }.on('didInsertElement'); - - extension[newKey()] = function() { - this.appEvents.off(eventName, this, cb); - }.on('willDestroyElement'); - - return extension; -} - -function listenForViewEvent(viewClass, eventName, cb) { - viewClass.reopen(createViewListener(eventName, cb)); -} - -export { listenForViewEvent, createViewListener }; export default Ember.Object.extend(Ember.Evented); diff --git a/app/assets/javascripts/discourse/lib/click-track.js.es6 b/app/assets/javascripts/discourse/lib/click-track.js.es6 index 799c26ada8..b25dacd98e 100644 --- a/app/assets/javascripts/discourse/lib/click-track.js.es6 +++ b/app/assets/javascripts/discourse/lib/click-track.js.es6 @@ -1,4 +1,5 @@ import DiscourseURL from 'discourse/lib/url'; +import { wantsNewWindow } from 'discourse/lib/intercept-click'; export function isValidLink($link) { return ($link.hasClass("track-link") || @@ -52,7 +53,7 @@ export default { } // if they want to open in a new tab, do an AJAX request - if (e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) { + if (wantsNewWindow(e)) { Discourse.ajax("/clicks/track", { data: { url: href, diff --git a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 b/app/assets/javascripts/discourse/lib/intercept-click.js.es6 index 658f55db64..09367beca2 100644 --- a/app/assets/javascripts/discourse/lib/intercept-click.js.es6 +++ b/app/assets/javascripts/discourse/lib/intercept-click.js.es6 @@ -1,12 +1,16 @@ import DiscourseURL from 'discourse/lib/url'; +export function wantsNewWindow(e) { + return (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey || (e.button && e.button !== 0)); +} + /** Discourse does some server side rendering of HTML, such as the `cooked` contents of posts. The downside of this in an Ember app is the links will not go through the router. This jQuery code intercepts clicks on those links and routes them properly. **/ export default function interceptClick(e) { - if (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey) { return; } + if (wantsNewWindow(e)) { return; } const $currentTarget = $(e.currentTarget), href = $currentTarget.attr('href'); diff --git a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 b/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 index e5ab51cb3d..bf1710d1c1 100644 --- a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 +++ b/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 @@ -1,12 +1,16 @@ // A Mixin that a view can use to listen for 'url:refresh' when -// it is on screen, and will send an action to the controller to -// refresh its data. +// it is on screen, and will send an action to refresh its data. // // This is useful if you want to get around Ember's default // behavior of not refreshing when navigating to the same place. +export default { + didInsertElement() { + this._super(); + this.appEvents.on('url:refresh', () => this.sendAction('refresh')); + }, -import { createViewListener } from 'discourse/lib/app-events'; - -export default createViewListener('url:refresh', function() { - this.get('controller').send('refresh'); -}); + willDestroyElement() { + this._super(); + this.appEvents.off('url:refresh'); + } +}; diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js.es6 index bb8ecaeb03..a7baf27a15 100644 --- a/app/assets/javascripts/discourse/routes/group-index.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-index.js.es6 @@ -1,14 +1,24 @@ -export default Discourse.Route.extend({ - actions: { - didTransition() { return true; } - }, +export function buildIndex(type) { + return Discourse.Route.extend({ + type, - model() { - return this.modelFor("group").findPosts(); - }, + model() { + return this.modelFor("group").findPosts({ type }); + }, - setupController(controller, model) { - controller.set("model", model); - this.controllerFor("group").set("showing", "posts"); - } -}); + setupController(controller, model) { + this.controllerFor('group-index').setProperties({ model, type }); + this.controllerFor("group").set("showing", type); + }, + + renderTemplate() { + this.render('group-index'); + }, + + actions: { + didTransition() { return true; } + } + }); +} + +export default buildIndex('posts'); diff --git a/app/assets/javascripts/discourse/routes/group-members.js.es6 b/app/assets/javascripts/discourse/routes/group-members.js.es6 index 22e328cacf..c6e00e8028 100644 --- a/app/assets/javascripts/discourse/routes/group-members.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-members.js.es6 @@ -8,5 +8,4 @@ export default Discourse.Route.extend({ controller.set("model", model); model.findMembers(); } - }); diff --git a/app/assets/javascripts/discourse/routes/group-mentions.js.es6 b/app/assets/javascripts/discourse/routes/group-mentions.js.es6 index 1054fb18d3..d5c7471f51 100644 --- a/app/assets/javascripts/discourse/routes/group-mentions.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-mentions.js.es6 @@ -1,11 +1,3 @@ -export default Discourse.Route.extend({ +import { buildIndex } from 'discourse/routes/group-index'; - model() { - return this.modelFor("group").findPosts({type: 'mentions'}); - }, - - setupController(controller, model) { - controller.set("model", model); - this.controllerFor("group").set("showing", "mentions"); - } -}); +export default buildIndex('mentions'); diff --git a/app/assets/javascripts/discourse/routes/group-messages.js.es6 b/app/assets/javascripts/discourse/routes/group-messages.js.es6 index 34e077e362..df27a3f793 100644 --- a/app/assets/javascripts/discourse/routes/group-messages.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-messages.js.es6 @@ -1,11 +1,3 @@ -export default Discourse.Route.extend({ +import { buildIndex } from 'discourse/routes/group-index'; - model() { - return this.modelFor("group").findPosts({type: 'messages'}); - }, - - setupController(controller, model) { - controller.set("model", model); - this.controllerFor("group").set("showing", "messages"); - } -}); +export default buildIndex('messages'); diff --git a/app/assets/javascripts/discourse/routes/group-topics.js.es6 b/app/assets/javascripts/discourse/routes/group-topics.js.es6 index 397572e77b..991bb7475a 100644 --- a/app/assets/javascripts/discourse/routes/group-topics.js.es6 +++ b/app/assets/javascripts/discourse/routes/group-topics.js.es6 @@ -1,11 +1,3 @@ -export default Discourse.Route.extend({ +import { buildIndex } from 'discourse/routes/group-index'; - model() { - return this.modelFor("group").findPosts({type: 'topics'}); - }, - - setupController(controller, model) { - controller.set("model", model); - this.controllerFor("group").set("showing", "topics"); - } -}); +export default buildIndex('topics'); diff --git a/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs b/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs index 42af3ae454..9ab4c17c68 100644 --- a/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs +++ b/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs @@ -1,7 +1,9 @@ -
    - {{#each posts as |post|}} - {{group-post post=post}} - {{else}} -
    {{i18n emptyText}}
    - {{/each}} -
    +{{#load-more selector=".user-stream .item" action="loadMore"}} +
    + {{#each posts as |post|}} + {{group-post post=post}} + {{else}} +
    {{i18n emptyText}}
    + {{/each}} +
    +{{/load-more}} diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/discovery/categories.hbs index dcd5c6acfd..7d26d35ba2 100644 --- a/app/assets/javascripts/discourse/templates/discovery/categories.hbs +++ b/app/assets/javascripts/discourse/templates/discovery/categories.hbs @@ -1,5 +1,5 @@ {{#if model.categories}} -
    + {{#discovery-categories refresh="refresh"}} @@ -54,6 +54,6 @@ {{/each}}
    -
    + {{/discovery-categories}}
    {{/if}} diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs index 9b55d626ae..8bb13926fc 100644 --- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs @@ -15,7 +15,7 @@ {{bulk-select-button selected=selected refreshTarget=controller}} -
    +{{#discovery-topics-list model=model refresh="refresh" incomingCount=topicTrackingState.incomingCount}} {{#if top}}
    {{period-chooser period=period action="changePeriod"}} @@ -32,23 +32,23 @@ {{/if}} {{#if hasTopics}} - {{topic-list - showTopicPostBadges=showTopicPostBadges - showPosters=true - currentUser=currentUser - canBulkSelect=canBulkSelect - changeSort="changeSort" - toggleBulkSelect="toggleBulkSelect" - hideCategory=model.hideCategory - order=order - ascending=ascending - bulkSelectEnabled=bulkSelectEnabled - selected=selected - expandGloballyPinned=expandGloballyPinned - expandAllPinned=expandAllPinned - topics=model.topics}} + {{topic-list + showTopicPostBadges=showTopicPostBadges + showPosters=true + currentUser=currentUser + canBulkSelect=canBulkSelect + changeSort="changeSort" + toggleBulkSelect="toggleBulkSelect" + hideCategory=model.hideCategory + order=order + ascending=ascending + bulkSelectEnabled=bulkSelectEnabled + selected=selected + expandGloballyPinned=expandGloballyPinned + expandAllPinned=expandAllPinned + topics=model.topics}} {{/if}} -
    +{{/discovery-topics-list}}
    {{conditional-loading-spinner condition=model.loadingMore}} diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs new file mode 100644 index 0000000000..1641286ad7 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/group-index.hbs @@ -0,0 +1 @@ +{{group-post-stream posts=controller emptyText=emptyText loadMore="loadMore"}} diff --git a/app/assets/javascripts/discourse/templates/group/index.hbs b/app/assets/javascripts/discourse/templates/group/index.hbs deleted file mode 100644 index 73ba496fa7..0000000000 --- a/app/assets/javascripts/discourse/templates/group/index.hbs +++ /dev/null @@ -1 +0,0 @@ -{{group-post-stream posts=controller emptyText="groups.empty.posts"}} diff --git a/app/assets/javascripts/discourse/templates/group/members.hbs b/app/assets/javascripts/discourse/templates/group/members.hbs index 2d3c9d80f5..41ad1fd922 100644 --- a/app/assets/javascripts/discourse/templates/group/members.hbs +++ b/app/assets/javascripts/discourse/templates/group/members.hbs @@ -7,36 +7,39 @@
    {{/if}} - - - - - {{#if isOwner}} - - {{/if}} - - {{#each model.members as |m|}} + + {{#load-more selector=".group-members tr" action="loadMore"}} +
    {{i18n 'last_post'}}{{i18n 'last_seen'}}
    - - - + + {{#if isOwner}} - + {{/if}} - {{/each}} -
    - {{user-info user=m}} - {{#if m.owner}}{{i18n "groups.owner"}}{{/if}} - - {{bound-date m.last_posted_at}} - - {{bound-date m.last_seen_at}} - {{i18n 'last_post'}}{{i18n 'last_seen'}} - {{#unless m.owner}} - - {{/unless}} -
    + {{#each model.members as |m|}} + + + {{user-info user=m}} + {{#if m.owner}}{{i18n "groups.owner"}}{{/if}} + + + {{bound-date m.last_posted_at}} + + + {{bound-date m.last_seen_at}} + + {{#if isOwner}} + + {{#unless m.owner}} + + {{/unless}} + + {{/if}} + + {{/each}} + + {{/load-more}} {{else}}
    {{i18n "groups.empty.users"}}
    {{/if}} diff --git a/app/assets/javascripts/discourse/templates/group/mentions.hbs b/app/assets/javascripts/discourse/templates/group/mentions.hbs deleted file mode 100644 index 3fa0965f26..0000000000 --- a/app/assets/javascripts/discourse/templates/group/mentions.hbs +++ /dev/null @@ -1 +0,0 @@ -{{group-post-stream posts=controller emptyText="groups.empty.mentions"}} diff --git a/app/assets/javascripts/discourse/templates/group/messages.hbs b/app/assets/javascripts/discourse/templates/group/messages.hbs deleted file mode 100644 index 9b457e64eb..0000000000 --- a/app/assets/javascripts/discourse/templates/group/messages.hbs +++ /dev/null @@ -1 +0,0 @@ -{{group-post-stream posts=controller emptyText="groups.empty.messages"}} diff --git a/app/assets/javascripts/discourse/templates/group/topics.hbs b/app/assets/javascripts/discourse/templates/group/topics.hbs deleted file mode 100644 index 2a9a4eed96..0000000000 --- a/app/assets/javascripts/discourse/templates/group/topics.hbs +++ /dev/null @@ -1 +0,0 @@ -{{group-post-stream posts=controller emptyText="groups.empty.topics"}} diff --git a/app/assets/javascripts/discourse/views/discovery-top.js.es6 b/app/assets/javascripts/discourse/views/discovery-top.js.es6 deleted file mode 100644 index 72d1e7167e..0000000000 --- a/app/assets/javascripts/discourse/views/discovery-top.js.es6 +++ /dev/null @@ -1,4 +0,0 @@ -import UrlRefresh from 'discourse/mixins/url-refresh'; -import ScrollTop from 'discourse/mixins/scroll-top'; - -export default Ember.View.extend(ScrollTop, UrlRefresh); diff --git a/app/assets/javascripts/discourse/views/group-index.js.es6 b/app/assets/javascripts/discourse/views/group-index.js.es6 deleted file mode 100644 index 4e25173395..0000000000 --- a/app/assets/javascripts/discourse/views/group-index.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(ScrollTop, LoadMore, { - eyelineSelector: '.user-stream .item', -}); diff --git a/app/assets/javascripts/discourse/views/group-members.js.es6 b/app/assets/javascripts/discourse/views/group-members.js.es6 deleted file mode 100644 index cae92ca87e..0000000000 --- a/app/assets/javascripts/discourse/views/group-members.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(ScrollTop, LoadMore, { - eyelineSelector: '.group-members tr', -}); diff --git a/app/assets/javascripts/discourse/views/group-mentions.js.es6 b/app/assets/javascripts/discourse/views/group-mentions.js.es6 deleted file mode 100644 index 4e25173395..0000000000 --- a/app/assets/javascripts/discourse/views/group-mentions.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(ScrollTop, LoadMore, { - eyelineSelector: '.user-stream .item', -}); diff --git a/app/assets/javascripts/discourse/views/group-topics.js.es6 b/app/assets/javascripts/discourse/views/group-topics.js.es6 deleted file mode 100644 index 4e25173395..0000000000 --- a/app/assets/javascripts/discourse/views/group-topics.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ScrollTop from 'discourse/mixins/scroll-top'; -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(ScrollTop, LoadMore, { - eyelineSelector: '.user-stream .item', -}); diff --git a/app/assets/javascripts/discourse/views/share.js.es6 b/app/assets/javascripts/discourse/views/share.js.es6 index c15f26d835..29ce3f95c6 100644 --- a/app/assets/javascripts/discourse/views/share.js.es6 +++ b/app/assets/javascripts/discourse/views/share.js.es6 @@ -1,3 +1,4 @@ +import { wantsNewWindow } from 'discourse/lib/intercept-click'; export default Ember.View.extend({ templateName: 'share', @@ -95,7 +96,7 @@ export default Ember.View.extend({ $html.on('click.discoure-share-link', '[data-share-url]', function(e) { // if they want to open in a new tab, let it so - if (e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) { return true; } + if (wantsNewWindow(e)) { return true; } e.preventDefault(); diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6 index 77fd4dcfe4..6ef0621a52 100644 --- a/app/assets/javascripts/discourse/views/topic.js.es6 +++ b/app/assets/javascripts/discourse/views/topic.js.es6 @@ -1,7 +1,6 @@ import AddCategoryClass from 'discourse/mixins/add-category-class'; import AddArchetypeClass from 'discourse/mixins/add-archetype-class'; import ClickTrack from 'discourse/lib/click-track'; -import { listenForViewEvent } from 'discourse/lib/app-events'; import { categoryBadgeHTML } from 'discourse/helpers/category-link'; import Scrolling from 'discourse/mixins/scrolling'; @@ -63,6 +62,9 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli return ClickTrack.trackClick(e); }); + this.appEvents.on('post:highlight', postNumber => { + Ember.run.scheduleOnce('afterRender', null, highlight, postNumber); + }); }.on('didInsertElement'), // This view is being removed. Shut down operations @@ -77,6 +79,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli // this happens after route exit, stuff could have trickled in this.appEvents.trigger('header:hide-topic'); + this.appEvents.off('post:highlight'); }.on('willDestroyElement'), @@ -200,8 +203,4 @@ function highlight(postNumber) { }); } -listenForViewEvent(TopicView, 'post:highlight', postNumber => { - Ember.run.scheduleOnce('afterRender', null, highlight, postNumber); -}); - export default TopicView; diff --git a/app/assets/javascripts/discourse/views/user-card.js.es6 b/app/assets/javascripts/discourse/views/user-card.js.es6 index 6e1b42d22b..584254c7e5 100644 --- a/app/assets/javascripts/discourse/views/user-card.js.es6 +++ b/app/assets/javascripts/discourse/views/user-card.js.es6 @@ -1,3 +1,4 @@ +import { wantsNewWindow } from 'discourse/lib/intercept-click'; import { setting } from 'discourse/lib/computed'; import CleansUp from 'discourse/mixins/cleans-up'; import afterTransition from 'discourse/lib/after-transition'; @@ -57,7 +58,7 @@ export default Ember.View.extend(CleansUp, { }; $('#main-outlet').on(clickDataExpand, '[data-user-card]', (e) => { - if (e.ctrlKey || e.metaKey) { return; } + if (wantsNewWindow(e)) { return; } const $target = $(e.currentTarget), username = $target.data('user-card'); @@ -65,7 +66,7 @@ export default Ember.View.extend(CleansUp, { }); $('#main-outlet').on(clickMention, 'a.mention', (e) => { - if (e.ctrlKey || e.metaKey) { return; } + if (wantsNewWindow(e)) { return; } const $target = $(e.target), username = $target.text().replace(/^@/, ''); diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 index 4f95c85a98..a99661e379 100644 --- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 +++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6 @@ -1,7 +1,8 @@ import { createWidget } from 'discourse/widgets/widget'; import { h } from 'virtual-dom'; import { iconNode } from 'discourse/helpers/fa-icon'; -import interceptClick from 'discourse/lib/intercept-click'; +import { wantsNewWindow } from 'discourse/lib/intercept-click'; +import DiscourseURL from 'discourse/lib/url'; export default createWidget('home-logo', { tagName: 'div.title', @@ -40,5 +41,11 @@ export default createWidget('home-logo', { return h('a', { attributes: { href: this.settings.href } }, this.logo()); }, - click: interceptClick + click(e) { + if (wantsNewWindow(e)) { return false; } + e.preventDefault(); + DiscourseURL.routeTo(this.settings.href); + return false; + } + }); diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6 index 587964b23d..5f1782fd05 100644 --- a/app/assets/javascripts/discourse/widgets/link.js.es6 +++ b/app/assets/javascripts/discourse/widgets/link.js.es6 @@ -1,3 +1,4 @@ +import { wantsNewWindow } from 'discourse/lib/intercept-click'; import { createWidget } from 'discourse/widgets/widget'; import { iconNode } from 'discourse/helpers/fa-icon'; import { h } from 'virtual-dom'; @@ -70,7 +71,7 @@ export default createWidget('link', { }, click(e) { - if (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey) { return; } + if (wantsNewWindow(e)) { return; } e.preventDefault(); if (this.attrs.action) { diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 index f152403ee6..b09284c157 100644 --- a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 +++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 @@ -1,3 +1,4 @@ +import { wantsNewWindow } from 'discourse/lib/intercept-click'; import RawHtml from 'discourse/widgets/raw-html'; import { createWidget } from 'discourse/widgets/widget'; import DiscourseURL from 'discourse/lib/url'; @@ -103,7 +104,7 @@ createWidget('notification-item', { if (document && document.cookie) { document.cookie = `cn=${id}; expires=Fri, 31 Dec 9999 23:59:59 GMT`; } - if (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey || e.button !== 0) { return; } + if (wantsNewWindow(e)) { return; } e.preventDefault(); this.sendWidgetEvent('linkClicked'); From 187d7d6f967dcd72f91a9191baede75bdd1edb3c Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 28 Apr 2016 16:13:34 -0400 Subject: [PATCH 079/125] Remove more views and deprecations. --- .../components/discovery-topics-list.js.es6 | 2 - .../discourse/components/load-more.js.es6 | 2 - .../discourse/components/user-stream.js.es6 | 24 +++ .../discourse/ember/resolver.js.es6 | 2 + .../discourse/lib/plugin-api.js.es6 | 2 +- .../discourse/mixins/load-more.js.es6 | 8 - .../{group/members.hbs => group-members.hbs} | 0 .../discourse/templates/user-invited-show.hbs | 178 +++++++++--------- .../discourse/templates/user-topics-list.hbs | 19 +- .../discourse/templates/user/posts.hbs | 54 +++--- .../discourse/templates/user/stream.hbs | 8 +- .../javascripts/discourse/templates/users.hbs | 108 +++++------ .../views/user-activity-stream.js.es6 | 27 --- .../discourse/views/user-invited-show.js.es6 | 7 - .../discourse/views/user-posts.js.es6 | 20 -- .../discourse/views/user-stream.js.es6 | 27 --- .../discourse/views/user-topics-list.js.es6 | 6 - .../javascripts/discourse/views/users.js.es6 | 5 - test/javascripts/lib/click-track-test.js.es6 | 2 +- 19 files changed, 216 insertions(+), 285 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/user-stream.js.es6 rename app/assets/javascripts/discourse/templates/{group/members.hbs => group-members.hbs} (100%) delete mode 100644 app/assets/javascripts/discourse/views/user-activity-stream.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-invited-show.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-posts.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-stream.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/user-topics-list.js.es6 delete mode 100644 app/assets/javascripts/discourse/views/users.js.es6 diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 index d5a67e3f63..5a154ca745 100644 --- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 +++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 @@ -3,8 +3,6 @@ import LoadMore from "discourse/mixins/load-more"; import UrlRefresh from 'discourse/mixins/url-refresh'; const DiscoveryTopicsListComponent = Ember.Component.extend(UrlRefresh, LoadMore, { - _viaComponent: true, - classNames: ['contents'], eyelineSelector: '.topic-list-item', diff --git a/app/assets/javascripts/discourse/components/load-more.js.es6 b/app/assets/javascripts/discourse/components/load-more.js.es6 index 4b355a5b0a..ab7591f5e9 100644 --- a/app/assets/javascripts/discourse/components/load-more.js.es6 +++ b/app/assets/javascripts/discourse/components/load-more.js.es6 @@ -1,8 +1,6 @@ import LoadMore from "discourse/mixins/load-more"; export default Ember.Component.extend(LoadMore, { - _viaComponent: true, - init() { this._super(); this.set('eyelineSelector', this.get('selector')); diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6 new file mode 100644 index 0000000000..ad38f8e040 --- /dev/null +++ b/app/assets/javascripts/discourse/components/user-stream.js.es6 @@ -0,0 +1,24 @@ +import LoadMore from "discourse/mixins/load-more"; + +export default Ember.Component.extend(LoadMore, { + loading: false, + eyelineSelector: '.user-stream .item', + classNames: ['user-stream'], + + _scrollTopOnModelChange: function() { + Em.run.schedule('afterRender', () => $(document).scrollTop(0)); + }.observes('stream.user.id'), + + actions: { + loadMore() { + if (this.get('loading')) { return; } + + this.set('loading', true); + const stream = this.get('stream'); + stream.findItems().then(() => { + this.set('loading', false); + this.get('eyeline').flushRest(); + }); + } + } +}); diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6 index d7124c0900..adf2e0f922 100644 --- a/app/assets/javascripts/discourse/ember/resolver.js.es6 +++ b/app/assets/javascripts/discourse/ember/resolver.js.es6 @@ -151,11 +151,13 @@ export default Ember.DefaultResolver.extend({ const withoutType = parsedName.fullNameWithoutType, slashedType = withoutType.replace(/\./g, '/'), decamelized = withoutType.decamelize(), + dashed = decamelized.replace(/\./g, '-').replace(/\_/g, '-'), templates = Ember.TEMPLATES; return this._super(parsedName) || templates[slashedType] || templates[withoutType] || + templates[dashed] || templates[decamelized.replace(/\./, '/')] || templates[decamelized.replace(/\_/, '/')] || this.findAdminTemplate(parsedName) || diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index f1d31936f8..028570517d 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -49,7 +49,7 @@ class PluginApi { if (!opts.onlyStream) { decorate(ComposerEditor, 'previewRefreshed', callback); - decorate(this.container.lookupFactory('view:user-stream'), 'didInsertElement', callback); + decorate(this.container.lookupFactory('component:user-stream'), 'didInsertElement', callback); } } diff --git a/app/assets/javascripts/discourse/mixins/load-more.js.es6 b/app/assets/javascripts/discourse/mixins/load-more.js.es6 index 16c8734054..c422e1cd63 100644 --- a/app/assets/javascripts/discourse/mixins/load-more.js.es6 +++ b/app/assets/javascripts/discourse/mixins/load-more.js.es6 @@ -5,14 +5,6 @@ import { on } from 'ember-addons/ember-computed-decorators'; // Provides the ability to load more items for a view which is scrolled to the bottom. export default Ember.Mixin.create(Ember.ViewTargetActionSupport, Scrolling, { - init() { - this._super(); - if (!this._viaComponent) { - console.warn('Using `LoadMore` as a view mixin is deprecated. Use `{{load-more}}` instead'); - } - - }, - scrolled() { const eyeline = this.get('eyeline'); return eyeline && eyeline.update(); diff --git a/app/assets/javascripts/discourse/templates/group/members.hbs b/app/assets/javascripts/discourse/templates/group-members.hbs similarity index 100% rename from app/assets/javascripts/discourse/templates/group/members.hbs rename to app/assets/javascripts/discourse/templates/group-members.hbs diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs index 29c37bcb99..f489c089e7 100644 --- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs +++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs @@ -1,100 +1,102 @@ {{#if canInviteToForum}} -
    -

    {{i18n 'user.invited.title'}}

    + {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action="loadMore"}} +
    +

    {{i18n 'user.invited.title'}}

    - {{#if model.can_see_invite_details}} -
    -
    -
      - {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}} - {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}} -
    -
    + {{#if model.can_see_invite_details}} +
    +
    +
      + {{nav-item route='userInvited.show' routeParam='pending' i18nLabel=pendingLabel}} + {{nav-item route='userInvited.show' routeParam='redeemed' i18nLabel=redeemedLabel}} +
    +
    -
    - {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} - {{#if canBulkInvite}} - {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} - {{/if}} -
    -
    - {{/if}} - - {{#if showSearch}} -
    -
    {{text-field value=searchTerm placeholderKey="user.invited.search"}}
    -
    - {{/if}} - - {{#if model.invites}} - - - {{#if inviteRedeemed}} - - - {{#if model.can_see_invite_details}} - - - - - +
    + {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} + {{#if canBulkInvite}} + {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} {{/if}} - {{else}} -
    - - {{/if}} - - {{#each invite in model.invites}} + + + {{/if}} + + {{#if showSearch}} +
    +
    {{text-field value=searchTerm placeholderKey="user.invited.search"}} +
    + {{/if}} + + {{#if model.invites}} +
    {{i18n 'user.invited.user'}}{{i18n 'user.invited.redeemed_at'}}{{i18n 'user.last_seen'}}{{i18n 'user.invited.topics_entered'}}{{i18n 'user.invited.posts_read_count'}}{{i18n 'user.invited.time_read'}}{{i18n 'user.invited.days_visited'}}{{i18n 'user.invited.user'}}{{i18n 'user.invited.sent'}}
    - {{#if invite.user}} - - + {{#if inviteRedeemed}} + + {{#if model.can_see_invite_details}} - - - - - + + + + + {{/if}} {{else}} - - - + + {{/if}} - {{/each}} -
    - {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} - {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}} - {{format-date invite.redeemed_at}}{{i18n 'user.invited.user'}}{{i18n 'user.invited.redeemed_at'}}{{format-date invite.user.last_seen_at}}{{number invite.user.topics_entered}}{{number invite.user.posts_read_count}}{{{unbound invite.user.time_read}}}{{{unbound invite.user.days_visited}}} - / - {{{unbound invite.user.days_since_created}}}{{i18n 'user.last_seen'}}{{i18n 'user.invited.topics_entered'}}{{i18n 'user.invited.posts_read_count'}}{{i18n 'user.invited.time_read'}}{{i18n 'user.invited.days_visited'}}{{unbound invite.email}}{{format-date invite.created_at}} - {{#if invite.expired}} - {{i18n 'user.invited.expired'}} -      - {{/if}} - {{#if invite.rescinded}} - {{i18n 'user.invited.rescinded'}} - {{else}} - {{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}} - {{/if}} -      - {{#if invite.reinvited}} - {{i18n 'user.invited.reinvited'}} - {{else}} - {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}} - {{/if}} - {{i18n 'user.invited.user'}}{{i18n 'user.invited.sent'}}
    - {{conditional-loading-spinner condition=invitesLoading}} + {{#each invite in model.invites}} + + {{#if invite.user}} + + {{#link-to 'user' invite.user}}{{avatar invite.user imageSize="tiny"}}{{/link-to}} + {{#link-to 'user' invite.user}}{{invite.user.username}}{{/link-to}} + + {{format-date invite.redeemed_at}} + {{#if model.can_see_invite_details}} + {{format-date invite.user.last_seen_at}} + {{number invite.user.topics_entered}} + {{number invite.user.posts_read_count}} + {{{unbound invite.user.time_read}}} + {{{unbound invite.user.days_visited}}} + / + {{{unbound invite.user.days_since_created}}} + {{/if}} + {{else}} + {{unbound invite.email}} + {{format-date invite.created_at}} + + {{#if invite.expired}} + {{i18n 'user.invited.expired'}} +      + {{/if}} + {{#if invite.rescinded}} + {{i18n 'user.invited.rescinded'}} + {{else}} + {{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}} + {{/if}} +      + {{#if invite.reinvited}} + {{i18n 'user.invited.reinvited'}} + {{else}} + {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}} + {{/if}} + + {{/if}} + + {{/each}} + + {{conditional-loading-spinner condition=invitesLoading}} - {{else}} -
    - {{#if canBulkInvite}} - {{{i18n 'user.invited.bulk_invite.none'}}} - {{else}} - {{i18n 'user.invited.none'}} - {{/if}} -
    - {{/if}} -
    + {{else}} +
    + {{#if canBulkInvite}} + {{{i18n 'user.invited.bulk_invite.none'}}} + {{else}} + {{i18n 'user.invited.none'}} + {{/if}} +
    + {{/if}} +
    + {{/load-more}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/templates/user-topics-list.hbs index 9505009d2e..e1b7a24cef 100644 --- a/app/assets/javascripts/discourse/templates/user-topics-list.hbs +++ b/app/assets/javascripts/discourse/templates/user-topics-list.hbs @@ -1,9 +1,10 @@ - -{{basic-topic-list topicList=model - hideCategory=hideCategory - showParticipants=showParticipants - showPosters=showPosters - canBulkSelect=canBulkSelect - bulkSelectEnabled=bulkSelectEnabled - selected=selected - postsAction="showTopicEntrance"}} +{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action="loadMore"}} + {{basic-topic-list topicList=model + hideCategory=hideCategory + showParticipants=showParticipants + showPosters=showPosters + canBulkSelect=canBulkSelect + bulkSelectEnabled=bulkSelectEnabled + selected=selected + postsAction="showTopicEntrance"}} +{{/load-more}} diff --git a/app/assets/javascripts/discourse/templates/user/posts.hbs b/app/assets/javascripts/discourse/templates/user/posts.hbs index 285824a59f..3da9819a57 100644 --- a/app/assets/javascripts/discourse/templates/user/posts.hbs +++ b/app/assets/javascripts/discourse/templates/user/posts.hbs @@ -1,28 +1,30 @@ -{{#each p in model.content}} -
    -
    - -
    - {{avatar p imageSize="large" extraClasses="actor" ignoreTitle="true"}} -
    -     - - {{format-date p.created_at leaveAgo="true"}} - - - {{unbound p.topic_title}} - - - {{category-link p.category}} - - {{#if p.deleted}} - - {{avatar p.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{format-date p.deleted_at leaveAgo="true"}} +{{#user-stream stream=model}} + {{#each p in model.content}} +
    +
    + +
    + {{avatar p imageSize="large" extraClasses="actor" ignoreTitle="true"}} +
    +     + + {{format-date p.created_at leaveAgo="true"}} - {{/if}} + + {{unbound p.topic_title}} + + + {{category-link p.category}} + + {{#if p.deleted}} + + {{avatar p.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{format-date p.deleted_at leaveAgo="true"}} + + {{/if}} +
    +

    + {{{p.excerpt}}} +

    -

    - {{{p.excerpt}}} -

    -
    -{{/each}} + {{/each}} +{{/user-stream}} diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs index c7b3114470..0a06e728c8 100644 --- a/app/assets/javascripts/discourse/templates/user/stream.hbs +++ b/app/assets/javascripts/discourse/templates/user/stream.hbs @@ -1,3 +1,5 @@ -{{#each model.content as |item|}} - {{stream-item item=item removeBookmark="removeBookmark"}} -{{/each}} +{{#user-stream stream=model}} + {{#each model.content as |item|}} + {{stream-item item=item removeBookmark="removeBookmark"}} + {{/each}} +{{/user-stream}} diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs index 71aad9499e..86c791e9e9 100644 --- a/app/assets/javascripts/discourse/templates/users.hbs +++ b/app/assets/javascripts/discourse/templates/users.hbs @@ -1,56 +1,58 @@ -
    -
    +{{#load-more selector=".directory tbody tr" action="loadMore"}} +
    +
    + +
    + {{period-chooser period=period}} + {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name"}} +
    + + {{#conditional-loading-spinner condition=model.loading}} + {{#if model.length}} +
    {{i18n "directory.total_rows" count=model.totalRows}}
    + + + + + {{directory-toggle field="likes_received" order=order asc=asc icon="heart"}} + {{directory-toggle field="likes_given" order=order asc=asc icon="heart"}} + {{directory-toggle field="topic_count" order=order asc=asc}} + {{directory-toggle field="post_count" order=order asc=asc}} + {{directory-toggle field="topics_entered" order=order asc=asc}} + {{directory-toggle field="posts_read" order=order asc=asc}} + {{directory-toggle field="days_visited" order=order asc=asc}} + {{#if showTimeRead}} + + {{/if}} + + + {{#each ic in model itemController="directory-item"}} + + {{#with ic.model as |it|}} + + + + + + + + + {{#if controller.parentController.showTimeRead}} + + {{/if}} + {{/with}} + + {{/each}} + +
     {{i18n "directory.time_read"}}
    {{user-info user=it.user}}{{number it.likes_received}}{{number it.likes_given}}{{number it.topic_count}}{{number it.post_count}}{{number it.topics_entered}}{{number it.posts_read}}{{number it.days_visited}}{{unbound it.time_read}}
    + + {{conditional-loading-spinner condition=model.loadingMore}} + {{else}} +
    +

    {{i18n "directory.no_results"}}

    + {{/if}} + {{/conditional-loading-spinner}} -
    - {{period-chooser period=period}} - {{text-field value=nameInput placeholderKey="directory.filter_name" class="filter-name"}}
    - - {{#conditional-loading-spinner condition=model.loading}} - {{#if model.length}} -
    {{i18n "directory.total_rows" count=model.totalRows}}
    - - - - - {{directory-toggle field="likes_received" order=order asc=asc icon="heart"}} - {{directory-toggle field="likes_given" order=order asc=asc icon="heart"}} - {{directory-toggle field="topic_count" order=order asc=asc}} - {{directory-toggle field="post_count" order=order asc=asc}} - {{directory-toggle field="topics_entered" order=order asc=asc}} - {{directory-toggle field="posts_read" order=order asc=asc}} - {{directory-toggle field="days_visited" order=order asc=asc}} - {{#if showTimeRead}} - - {{/if}} - - - {{#each ic in model itemController="directory-item"}} - - {{#with ic.model as |it|}} - - - - - - - - - {{#if controller.parentController.showTimeRead}} - - {{/if}} - {{/with}} - - {{/each}} - -
     {{i18n "directory.time_read"}}
    {{user-info user=it.user}}{{number it.likes_received}}{{number it.likes_given}}{{number it.topic_count}}{{number it.post_count}}{{number it.topics_entered}}{{number it.posts_read}}{{number it.days_visited}}{{unbound it.time_read}}
    - - {{conditional-loading-spinner condition=model.loadingMore}} - {{else}} -
    -

    {{i18n "directory.no_results"}}

    - {{/if}} - {{/conditional-loading-spinner}} -
    -
    +{{/load-more}} diff --git a/app/assets/javascripts/discourse/views/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/views/user-activity-stream.js.es6 deleted file mode 100644 index 86fbaefd8f..0000000000 --- a/app/assets/javascripts/discourse/views/user-activity-stream.js.es6 +++ /dev/null @@ -1,27 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - loading: false, - eyelineSelector: '.user-stream .item', - classNames: ['user-stream'], - - _scrollTopOnModelChange: function() { - Em.run.schedule('afterRender', function() { - $(document).scrollTop(0); - }); - }.observes('controller.model.user.id'), - - actions: { - loadMore() { - const self = this; - if (this.get('loading')) { return; } - - this.set('loading', true); - const stream = this.get('controller.model'); - stream.findItems().then(function() { - self.set('loading', false); - self.get('eyeline').flushRest(); - }); - } - } -}); diff --git a/app/assets/javascripts/discourse/views/user-invited-show.js.es6 b/app/assets/javascripts/discourse/views/user-invited-show.js.es6 deleted file mode 100644 index 25ae5e30d6..0000000000 --- a/app/assets/javascripts/discourse/views/user-invited-show.js.es6 +++ /dev/null @@ -1,7 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - classNames: ['paginated-topics-list'], - eyelineSelector: '.paginated-topics-list .user-invite-list tr', - templateName: 'user-invited-show' -}); diff --git a/app/assets/javascripts/discourse/views/user-posts.js.es6 b/app/assets/javascripts/discourse/views/user-posts.js.es6 deleted file mode 100644 index 6a4d254fcf..0000000000 --- a/app/assets/javascripts/discourse/views/user-posts.js.es6 +++ /dev/null @@ -1,20 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - loading: false, - eyelineSelector: ".user-stream .item", - classNames: ["user-stream"], - - actions: { - loadMore: function() { - var self = this; - if (this.get("loading")) { return; } - - var postsStream = this.get("controller.model"); - postsStream.findItems().then(function () { - self.set("loading", false); - self.get("eyeline").flushRest(); - }).catch(function () { }); - } - } -}); diff --git a/app/assets/javascripts/discourse/views/user-stream.js.es6 b/app/assets/javascripts/discourse/views/user-stream.js.es6 deleted file mode 100644 index 86fbaefd8f..0000000000 --- a/app/assets/javascripts/discourse/views/user-stream.js.es6 +++ /dev/null @@ -1,27 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - loading: false, - eyelineSelector: '.user-stream .item', - classNames: ['user-stream'], - - _scrollTopOnModelChange: function() { - Em.run.schedule('afterRender', function() { - $(document).scrollTop(0); - }); - }.observes('controller.model.user.id'), - - actions: { - loadMore() { - const self = this; - if (this.get('loading')) { return; } - - this.set('loading', true); - const stream = this.get('controller.model'); - stream.findItems().then(function() { - self.set('loading', false); - self.get('eyeline').flushRest(); - }); - } - } -}); diff --git a/app/assets/javascripts/discourse/views/user-topics-list.js.es6 b/app/assets/javascripts/discourse/views/user-topics-list.js.es6 deleted file mode 100644 index b60d907613..0000000000 --- a/app/assets/javascripts/discourse/views/user-topics-list.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import LoadMore from "discourse/mixins/load-more"; - -export default Ember.View.extend(LoadMore, { - classNames: ['paginated-topics-list'], - eyelineSelector: '.paginated-topics-list .topic-list tr', -}); diff --git a/app/assets/javascripts/discourse/views/users.js.es6 b/app/assets/javascripts/discourse/views/users.js.es6 deleted file mode 100644 index 1af01b7481..0000000000 --- a/app/assets/javascripts/discourse/views/users.js.es6 +++ /dev/null @@ -1,5 +0,0 @@ -import LoadMore from 'discourse/mixins/load-more'; - -export default Ember.View.extend(LoadMore, { - eyelineSelector: '.directory tbody tr' -}); diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js.es6 index ae571b742a..2bcfc673e0 100644 --- a/test/javascripts/lib/click-track-test.js.es6 +++ b/test/javascripts/lib/click-track-test.js.es6 @@ -167,7 +167,7 @@ testOpenInANewTab("it opens in a new tab when pressing ctrl", function(clickEven }); testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent) { - clickEvent.which = 2; + clickEvent.button = 2; }); test("tracks via AJAX if we're on the same site", function() { From 400c06104601dce684e1ffb3218bcbdfe9a68e6b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 28 Apr 2016 16:37:20 -0400 Subject: [PATCH 080/125] `Ember.keys` is deprected in favor of `Object.keys` --- app/assets/javascripts/discourse.js | 4 ++-- app/assets/javascripts/discourse/components/d-editor.js.es6 | 4 ++-- .../discourse/controllers/discovery-sortable.js.es6 | 2 +- .../javascripts/discourse/controllers/discovery/topics.js.es6 | 2 +- app/assets/javascripts/discourse/ember/resolver.js.es6 | 2 +- app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 | 2 +- .../javascripts/discourse/helpers/register-unbound.js.es6 | 2 +- .../discourse/initializers/auto-load-modules.js.es6 | 2 +- app/assets/javascripts/discourse/models/post.js.es6 | 2 +- app/assets/javascripts/discourse/models/site.js.es6 | 2 +- app/assets/javascripts/discourse/models/user.js.es6 | 2 +- app/assets/javascripts/discourse/router.js.es6 | 2 +- .../javascripts/discourse/routes/build-topic-route.js.es6 | 4 ++-- test/javascripts/helpers/fixture-pretender.js.es6 | 4 ++-- test/javascripts/test_helper.js | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js index 1aa7fe9246..36a73256dc 100644 --- a/app/assets/javascripts/discourse.js +++ b/app/assets/javascripts/discourse.js @@ -107,7 +107,7 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, { $('noscript').remove(); - Ember.keys(requirejs._eak_seen).forEach(function(key) { + Object.keys(requirejs._eak_seen).forEach(function(key) { if (/\/pre\-initializers\//.test(key)) { var module = require(key, null, null, true); if (!module) { throw new Error(key + ' must export an initializer.'); } @@ -115,7 +115,7 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, { } }); - Ember.keys(requirejs._eak_seen).forEach(function(key) { + Object.keys(requirejs._eak_seen).forEach(function(key) { if (/\/initializers\//.test(key)) { var module = require(key, null, null, true); if (!module) { throw new Error(key + ' must export an initializer.'); } diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index 26521ca4d9..01afbacd91 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -218,7 +218,7 @@ export default Ember.Component.extend({ const mouseTrap = Mousetrap(this.$('.d-editor-input')[0]); const shortcuts = this.get('toolbar.shortcuts'); - Ember.keys(shortcuts).forEach(sc => { + Object.keys(shortcuts).forEach(sc => { const button = shortcuts[sc]; mouseTrap.bind(sc, () => { this.send(button.action, button); @@ -244,7 +244,7 @@ export default Ember.Component.extend({ this.appEvents.off('composer:insert-text'); const mouseTrap = this._mouseTrap; - Ember.keys(this.get('toolbar.shortcuts')).forEach(sc => mouseTrap.unbind(sc)); + Object.keys(this.get('toolbar.shortcuts')).forEach(sc => mouseTrap.unbind(sc)); this.$('.d-editor-preview').off('click.preview'); }, diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 index 8786828d7a..5ac8d4b733 100644 --- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 @@ -12,7 +12,7 @@ export var queryParams = { // Basic controller options var controllerOpts = { needs: ['discovery/topics'], - queryParams: Ember.keys(queryParams), + queryParams: Object.keys(queryParams), }; // Aliases for the values diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 index cc411691c5..008ab29a3b 100644 --- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 @@ -142,7 +142,7 @@ const controllerOpts = { }; -Ember.keys(queryParams).forEach(function(p) { +Object.keys(queryParams).forEach(function(p) { // If we don't have a default value, initialize it to null if (typeof controllerOpts[p] === 'undefined') { controllerOpts[p] = null; diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6 index adf2e0f922..8f41a2c507 100644 --- a/app/assets/javascripts/discourse/ember/resolver.js.es6 +++ b/app/assets/javascripts/discourse/ember/resolver.js.es6 @@ -70,7 +70,7 @@ export default Ember.DefaultResolver.extend({ // If we end with the name we want, use it. This allows us to define components within plugins. const suffix = parsedName.type + 's/' + parsedName.fullNameWithoutType, dashed = Ember.String.dasherize(suffix), - moduleName = Ember.keys(requirejs.entries).find(function(e) { + moduleName = Object.keys(requirejs.entries).find(function(e) { return (e.indexOf(suffix, e.length - suffix.length) !== -1) || (e.indexOf(dashed, e.length - dashed.length) !== -1); }); diff --git a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 index 6da20c3423..f55beeba54 100644 --- a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 +++ b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 @@ -60,7 +60,7 @@ function findOutlets(collection, callback) { const disabledPlugins = Discourse.Site.currentProp('disabled_plugins') || []; - Ember.keys(collection).forEach(function(res) { + Object.keys(collection).forEach(function(res) { if (res.indexOf("/connectors/") !== -1) { // Skip any disabled plugins for (let i=0; i { + Object.keys(requirejs.entries).forEach(entry => { if ((/\/helpers\//).test(entry)) { require(entry, null, null, true); } diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index 37005bc993..c2403aafac 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -108,7 +108,7 @@ const Post = RestModel.extend({ // Put the metaData into the request if (metaData) { data.meta_data = {}; - Ember.keys(metaData).forEach(function(key) { data.meta_data[key] = metaData.get(key); }); + Object.keys(metaData).forEach(function(key) { data.meta_data[key] = metaData.get(key); }); } return data; diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6 index 988ba1eac7..76d9d49e75 100644 --- a/app/assets/javascripts/discourse/models/site.js.es6 +++ b/app/assets/javascripts/discourse/models/site.js.es6 @@ -41,7 +41,7 @@ const Site = RestModel.extend({ } }); - Ember.keys(remaining).forEach(parentCategoryId => { + Object.keys(remaining).forEach(parentCategoryId => { const category = result.findBy('id', parseInt(parentCategoryId, 10)), index = result.indexOf(category); diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index b74c2cd2cc..6e0d2aa41d 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -136,7 +136,7 @@ const User = RestModel.extend({ }, copy() { - return Discourse.User.create(this.getProperties(Ember.keys(this))); + return Discourse.User.create(this.getProperties(Object.keys(this))); }, save() { diff --git a/app/assets/javascripts/discourse/router.js.es6 b/app/assets/javascripts/discourse/router.js.es6 index 950e78cb8e..0223dfe41b 100644 --- a/app/assets/javascripts/discourse/router.js.es6 +++ b/app/assets/javascripts/discourse/router.js.es6 @@ -15,7 +15,7 @@ export function mapRoutes() { // will be built automatically. You can supply a `resource` property to // automatically put it in that resource, such as `admin`. That way plugins // can define admin routes. - Ember.keys(requirejs._eak_seen).forEach(function(key) { + Object.keys(requirejs._eak_seen).forEach(function(key) { if (/route-map$/.test(key)) { var module = require(key, null, null, true); if (!module || !module.default) { throw new Error(key + ' must export a route map.'); } diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 index 990a882157..b2e5f3281e 100644 --- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 +++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 @@ -4,7 +4,7 @@ import { queryParams } from 'discourse/controllers/discovery-sortable'; function filterQueryParams(params, defaultParams) { const findOpts = defaultParams || {}; if (params) { - Ember.keys(queryParams).forEach(function(opt) { + Object.keys(queryParams).forEach(function(opt) { if (params[opt]) { findOpts[opt] = params[opt]; } }); } @@ -38,7 +38,7 @@ function findTopicList(store, tracking, filter, filterParams, extras) { // Clean up any string parameters that might slip through filterParams = filterParams || {}; - Ember.keys(filterParams).forEach(function(k) { + Object.keys(filterParams).forEach(function(k) { const val = filterParams[k]; if (val === "undefined" || val === "null" || val === 'false') { filterParams[k] = undefined; diff --git a/test/javascripts/helpers/fixture-pretender.js.es6 b/test/javascripts/helpers/fixture-pretender.js.es6 index dea96b35a9..80b208099e 100644 --- a/test/javascripts/helpers/fixture-pretender.js.es6 +++ b/test/javascripts/helpers/fixture-pretender.js.es6 @@ -3,12 +3,12 @@ export default function(helpers) { const fixturesByUrl = {}; // Load any fixtures automatically - Ember.keys(require._eak_seen).forEach(entry => { + Object.keys(require._eak_seen).forEach(entry => { if (/^fixtures/.test(entry)) { const fixture = require(entry, null, null, true); if (fixture && fixture.default) { const obj = fixture.default; - Ember.keys(obj).forEach(url => { + Object.keys(obj).forEach(url => { fixturesByUrl[url] = obj[url]; this.get(url, () => response(obj[url])); }); diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 852a67d18f..7362298d15 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -132,7 +132,7 @@ window.asyncTestDiscourse = helpers.asyncTestDiscourse; window.controllerFor = helpers.controllerFor; window.fixture = helpers.fixture; -Ember.keys(requirejs.entries).forEach(function(entry) { +Object.keys(requirejs.entries).forEach(function(entry) { if ((/\-test/).test(entry)) { require(entry, null, null, true); } From 6451eb7637235a68df1e991f0f532d78d1f6f470 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 28 Apr 2016 16:49:24 -0400 Subject: [PATCH 081/125] `.@each` on leafs is deprecated in favor of `.[]` --- app/assets/javascripts/admin/controllers/admin-api.js.es6 | 2 +- .../admin/controllers/admin-user-badges.js.es6 | 4 ++-- .../javascripts/admin/controllers/admin-user-index.js.es6 | 2 +- .../javascripts/admin/views/admin-backups-logs.js.es6 | 2 +- .../discourse/components/basic-topic-list.js.es6 | 2 +- .../javascripts/discourse/components/combo-box.js.es6 | 2 +- .../discourse/controllers/create-account.js.es6 | 4 ++-- .../discourse/controllers/group/members.js.es6 | 2 +- app/assets/javascripts/discourse/controllers/login.js.es6 | 2 +- .../javascripts/discourse/controllers/user-card.js.es6 | 2 +- .../discourse/controllers/user-private-messages.js.es6 | 2 +- .../javascripts/discourse/models/post-stream.js.es6 | 8 ++++---- app/assets/javascripts/discourse/models/site.js.es6 | 4 ++-- app/assets/javascripts/discourse/models/topic.js.es6 | 2 +- .../javascripts/discourse/models/user-action.js.es6 | 8 ++++---- app/assets/javascripts/discourse/models/user.js.es6 | 2 +- .../javascripts/discourse/views/topic-progress.js.es6 | 2 +- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-api.js.es6 b/app/assets/javascripts/admin/controllers/admin-api.js.es6 index 1bb0a7dc2f..82366d3bd7 100644 --- a/app/assets/javascripts/admin/controllers/admin-api.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-api.js.es6 @@ -63,6 +63,6 @@ export default Ember.ArrayController.extend({ **/ hasMasterKey: function() { return !!this.get('model').findBy('user', null); - }.property('model.@each') + }.property('model.[]') }); diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 index 8d919e5f26..c8c0ba6219 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 @@ -40,7 +40,7 @@ export default Ember.ArrayController.extend({ return _(expanded).sortBy(group => group.granted_at).reverse().value(); - }.property('model', 'model.@each', 'model.expandedBadges.@each'), + }.property('model', 'model.[]', 'model.expandedBadges.[]'), /** Array of badges that have not been granted to this user. @@ -62,7 +62,7 @@ export default Ember.ArrayController.extend({ }); return _.sortBy(badges, badge => badge.get('name')); - }.property('badges.@each', 'model.@each'), + }.property('badges.[]', 'model.[]'), /** Whether there are any badges that can be granted. diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 index 454aa96f84..a5e34fc257 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 @@ -27,7 +27,7 @@ export default Ember.Controller.extend(CanCheckEmails, { }); } return []; - }.property('model.user_fields.@each'), + }.property('model.user_fields.[]'), actions: { toggleTitleEdit() { diff --git a/app/assets/javascripts/admin/views/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/views/admin-backups-logs.js.es6 index c5ba44e27e..cb838a48fc 100644 --- a/app/assets/javascripts/admin/views/admin-backups-logs.js.es6 +++ b/app/assets/javascripts/admin/views/admin-backups-logs.js.es6 @@ -27,7 +27,7 @@ export default Ember.View.extend({ // force rerender this.rerender(); } - }, 150).observes("controller.model.@each"), + }, 150).observes("controller.model.[]"), render(buffer) { const formattedLogs = this.get("formattedLogs"); diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 index 53ebb014b6..75c4d370c0 100644 --- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 +++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 @@ -13,7 +13,7 @@ export default Ember.Component.extend({ _topicListChanged: function() { this._initFromTopicList(this.get('topicList')); - }.observes('topicList.@each'), + }.observes('topicList.[]'), _initFromTopicList(topicList) { if (topicList !== null) { diff --git a/app/assets/javascripts/discourse/components/combo-box.js.es6 b/app/assets/javascripts/discourse/components/combo-box.js.es6 index 83b9290bf6..e023ad267c 100644 --- a/app/assets/javascripts/discourse/components/combo-box.js.es6 +++ b/app/assets/javascripts/discourse/components/combo-box.js.es6 @@ -46,7 +46,7 @@ export default Ember.Component.extend({ } }, - @observes('content.@each') + @observes('content.[]') _rerenderOnChange() { this.rerender(); }, diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6 index bc6ccf62a8..9ff65be628 100644 --- a/app/assets/javascripts/discourse/controllers/create-account.js.es6 +++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6 @@ -127,7 +127,7 @@ export default Ember.Controller.extend(ModalFunctionality, { failed: true, reason: I18n.t('user.email.invalid') }); - }.property('accountEmail', 'rejectedEmails.@each'), + }.property('accountEmail', 'rejectedEmails.[]'), emailValidated: function() { return this.get('authOptions.email') === this.get("accountEmail") && this.get('authOptions.email_valid'); @@ -326,7 +326,7 @@ export default Ember.Controller.extend(ModalFunctionality, { ok: true, reason: I18n.t('user.password.ok') }); - }.property('accountPassword', 'rejectedPasswords.@each', 'accountUsername', 'accountEmail', 'isDeveloper'), + }.property('accountPassword', 'rejectedPasswords.[]', 'accountUsername', 'accountEmail', 'isDeveloper'), @on('init') fetchConfirmationValue() { diff --git a/app/assets/javascripts/discourse/controllers/group/members.js.es6 b/app/assets/javascripts/discourse/controllers/group/members.js.es6 index 09c4b9a63f..306ff8aa80 100644 --- a/app/assets/javascripts/discourse/controllers/group/members.js.es6 +++ b/app/assets/javascripts/discourse/controllers/group/members.js.es6 @@ -7,7 +7,7 @@ export default Ember.Controller.extend({ limit: null, offset: null, - @computed('model.owners.@each') + @computed('model.owners.[]') isOwner(owners) { if (this.get('currentUser.admin')) { return true; diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6 index 02969cf5e1..d85d449ac7 100644 --- a/app/assets/javascripts/discourse/controllers/login.js.es6 +++ b/app/assets/javascripts/discourse/controllers/login.js.es6 @@ -27,7 +27,7 @@ export default Ember.Controller.extend(ModalFunctionality, { **/ hasAtLeastOneLoginButton: function() { return Em.get("Discourse.LoginMethod.all").length > 0; - }.property("Discourse.LoginMethod.all.@each"), + }.property("Discourse.LoginMethod.all.[]"), loginButtonText: function() { return this.get('loggingIn') ? I18n.t('login.logging_in') : I18n.t('login.title'); diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6 index 39d938b8c7..0001f1c23b 100644 --- a/app/assets/javascripts/discourse/controllers/user-card.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6 @@ -49,7 +49,7 @@ export default Ember.Controller.extend({ moreBadgesCount: function() { return this.get('user.badge_count') - this.get('user.featured_user_badges.length'); - }.property('user.badge_count', 'user.featured_user_badges.@each'), + }.property('user.badge_count', 'user.featured_user_badges.[]'), hasCardBadgeImage: function() { const img = this.get('user.card_badge.image'); diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 index 06a1be30db..18f010adcc 100644 --- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 @@ -15,7 +15,7 @@ export default Ember.Controller.extend({ Discourse.User.currentProp('can_send_private_messages'); }.property('controllers.user.viewingSelf'), - @computed('selected.@each', 'bulkSelectEnabled') + @computed('selected.[]', 'bulkSelectEnabled') hasSelection(selected, bulkSelectEnabled){ return bulkSelectEnabled && selected && selected.length > 0; }, diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6 index 1555118be5..75e9ef2382 100644 --- a/app/assets/javascripts/discourse/models/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/post-stream.js.es6 @@ -40,7 +40,7 @@ export default RestModel.extend({ notLoading: Ember.computed.not('loading'), filteredPostsCount: Ember.computed.alias("stream.length"), - @computed('posts.@each') + @computed('posts.[]') hasPosts() { return this.get('posts.length') > 0; }, @@ -53,7 +53,7 @@ export default RestModel.extend({ canAppendMore: Ember.computed.and('notLoading', 'hasPosts', 'lastPostNotLoaded'), canPrependMore: Ember.computed.and('notLoading', 'hasPosts', 'firstPostNotLoaded'), - @computed('hasLoadedData', 'firstPostId', 'posts.@each') + @computed('hasLoadedData', 'firstPostId', 'posts.[]') firstPostPresent(hasLoadedData, firstPostId) { if (!hasLoadedData) { return false; } return !!this.get('posts').findProperty('id', firstPostId); @@ -101,7 +101,7 @@ export default RestModel.extend({ Returns the window of posts above the current set in the stream, bound to the top of the stream. This is the collection we'll ask for when scrolling upwards. **/ - @computed('posts.@each', 'stream.@each') + @computed('posts.[]', 'stream.[]') previousWindow() { // If we can't find the last post loaded, bail const firstPost = _.first(this.get('posts')); @@ -121,7 +121,7 @@ export default RestModel.extend({ Returns the window of posts below the current set in the stream, bound by the bottom of the stream. This is the collection we use when scrolling downwards. **/ - @computed('posts.lastObject', 'stream.@each') + @computed('posts.lastObject', 'stream.[]') nextWindow(lastLoadedPost) { // If we can't find the last post loaded, bail if (!lastLoadedPost) { return []; } diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6 index 76d9d49e75..37c1299049 100644 --- a/app/assets/javascripts/discourse/models/site.js.es6 +++ b/app/assets/javascripts/discourse/models/site.js.es6 @@ -15,7 +15,7 @@ const Site = RestModel.extend({ return result; }, - @computed("post_action_types.@each") + @computed("post_action_types.[]") flagTypes() { const postActionTypes = this.get('post_action_types'); if (!postActionTypes) return []; @@ -26,7 +26,7 @@ const Site = RestModel.extend({ categoriesByCount: Ember.computed.sort('categories', 'topicCountDesc'), // Sort subcategories under parents - @computed("categoriesByCount", "categories.@each") + @computed("categoriesByCount", "categories.[]") sortedCategories(cats) { const result = [], remaining = {}; diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index 888f09838c..949386c9f2 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -32,7 +32,7 @@ const Topic = RestModel.extend({ return poster && poster.user; }, - @computed('posters.@each') + @computed('posters.[]') lastPoster(posters) { var user; if (posters && posters.length > 0) { diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6 index 50af402544..a4e784bd24 100644 --- a/app/assets/javascripts/discourse/models/user-action.js.es6 +++ b/app/assets/javascripts/discourse/models/user-action.js.es6 @@ -147,10 +147,10 @@ const UserAction = RestModel.extend({ } return rval; }.property("childGroups", - "childGroups.likes.items", "childGroups.likes.items.@each", - "childGroups.stars.items", "childGroups.stars.items.@each", - "childGroups.edits.items", "childGroups.edits.items.@each", - "childGroups.bookmarks.items", "childGroups.bookmarks.items.@each"), + "childGroups.likes.items", "childGroups.likes.items.[]", + "childGroups.stars.items", "childGroups.stars.items.[]", + "childGroups.edits.items", "childGroups.edits.items.[]", + "childGroups.bookmarks.items", "childGroups.bookmarks.items.[]"), switchToActing() { this.setProperties({ diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index 6e0d2aa41d..55456dfb1a 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -229,7 +229,7 @@ const User = RestModel.extend({ ua.action_type === UserAction.TYPES.topics; }, - @computed("groups.@each") + @computed("groups.[]") displayGroups() { const groups = this.get('groups'); const filtered = groups.filter(group => { diff --git a/app/assets/javascripts/discourse/views/topic-progress.js.es6 b/app/assets/javascripts/discourse/views/topic-progress.js.es6 index 7454c99d2d..7d16f99637 100644 --- a/app/assets/javascripts/discourse/views/topic-progress.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-progress.js.es6 @@ -23,7 +23,7 @@ export default Ember.View.extend({ _updateBar: function() { Em.run.scheduleOnce('afterRender', this, '_updateProgressBar'); - }.observes('controller.streamPercentage', 'controller.model.postStream.stream.@each').on('init'), + }.observes('controller.streamPercentage', 'controller.model.postStream.stream.[]').on('init'), _updateProgressBar: function() { // speeds up stuff, bypass jquery slowness and extra checks From 6991b55ea588b88ae77a964109ca38beb0307194 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Thu, 28 Apr 2016 15:03:09 -0700 Subject: [PATCH 082/125] combine "users to log in via" line --- docs/INSTALL-cloud.md | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md index 64e9f42d7c..2db37a0daf 100644 --- a/docs/INSTALL-cloud.md +++ b/docs/INSTALL-cloud.md @@ -16,7 +16,7 @@ Create your new Droplet. You will receive an email with the root password to you # Access Your Cloud Server -Connect to your server via its IP address with SSH, or use [Putty][put] on Windows: +Connect to your server via its IP address using SSH, or [Putty][put] on Windows: ssh root@192.168.1.1 @@ -79,13 +79,13 @@ If you need to change or fix your email settings after bootstrapping, edit your Register a new admin account using one of the email addresses you entered before bootstrapping. -(If you are unable to register your admin account, check the logs at `/var/discourse/shared/standalone/log/rails/production.log` and see our [Email Troubleshooting checklist](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326).) +If you are unable to register your admin account, check the logs at `/var/discourse/shared/standalone/log/rails/production.log` and see our [Email Troubleshooting checklist](https://meta.discourse.org/t/troubleshooting-email-on-a-new-discourse-install/16326). You should see Staff topics and **READ ME FIRST: Admin Quick Start Guide**. This guide contains the next steps for further configuring and customizing your Discourse install as an administrator. Read it closely! -(If you are unable to register a new admin account via email, see [Create Admin Account from Console](https://meta.discourse.org/t/create-admin-account-from-console/17274), but please note that *you will have a broken site* unless you get email working on your instance.) +(If you are still unable to register a new admin account via email, see [Create Admin Account from Console](https://meta.discourse.org/t/create-admin-account-from-console/17274), but note that *you will have a broken site* unless you get email working.) # Post-Install Maintenance @@ -99,21 +99,21 @@ You will get email reminders as new versions of Discourse are released. Please s The `launcher` command in the `/var/discourse` folder can be used for various kinds of maintenance: ``` -Usage: launcher COMMAND CONFIG [--skip-prereqs] +Usage: launcher COMMAND CONFIG [--skip-prereqs] [--docker-args STRING] Commands: start: Start/initialize a container stop: Stop a running container restart: Restart a container destroy: Stop and remove a container - enter: Enter a container using docker exec - logs: Docker logs for container + enter: Use nsenter to get a shell into a container + logs: View the Docker logs for a container bootstrap: Bootstrap a container for the config based on a template rebuild: Rebuild a container (destroy old, bootstrap, start new) cleanup: Remove all containers that have stopped for > 24 hours Options: - --skip-prereqs Don't check prerequisites - --docker-args Extra arguments to pass when running docker + --skip-prereqs Don't check launcher prerequisites + --docker-args Extra arguments to pass when running docker ``` # Add More Discourse Features @@ -122,19 +122,13 @@ Do you want... * Users to log in *only* via your pre-existing website's registration system? [Configure Single-Sign-On](https://meta.discourse.org/t/official-single-sign-on-for-discourse/13045). -- Users to log in via Google? [Configure Google logins](https://meta.discourse.org/t/configuring-google-oauth2-login-for-discourse/15858). - -- Users to log in via Facebook? [Configure Facebook logins](https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394). - -- Users to log in via Twitter? [Configure Twitter logins](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395). - -- Users to log in via GitHub? [Configure GitHub logins](https://meta.discourse.org/t/configuring-github-login-for-discourse/13745) +- Users to log in via [Google](https://meta.discourse.org/t/configuring-google-oauth2-login-for-discourse/15858), [Twitter](https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395), [GitHub](https://meta.discourse.org/t/configuring-github-login-for-discourse/13745), or [Facebook](https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394)? - Users to post replies via email? [Configure reply via email](https://meta.discourse.org/t/set-up-reply-via-email-support/14003). - Automatic daily backups? [Configure backups](https://meta.discourse.org/t/configure-automatic-backups-for-discourse/14855). -- Free HTTPS / SSL support? [Configure Let's Encrypt](https://meta.discourse.org/t/setting-up-lets-encrypt-cert-with-discourse-docker/40709) +- Free HTTPS / SSL support? [Configure Let's Encrypt](https://meta.discourse.org/t/setting-up-lets-encrypt-cert-with-discourse-docker/40709). - Paid HTTPS / SSL support? [Configure SSL](https://meta.discourse.org/t/allowing-ssl-for-your-discourse-docker-setup/13847). @@ -142,9 +136,9 @@ Do you want... - A Content Delivery Network to speed up worldwide access? [Configure a CDN](https://meta.discourse.org/t/enable-a-cdn-for-your-discourse/14857). We recommend [Fastly](http://www.fastly.com/). -- Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc? [See our open source importers](https://github.com/discourse/discourse/tree/master/script/import_scripts) +- Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc? [See our open source importers](https://github.com/discourse/discourse/tree/master/script/import_scripts). -- A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584) +- A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584). - To embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963)? From 0adaa8d362269cb44907abb0a288a0389bfd6255 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 29 Apr 2016 11:42:01 +0530 Subject: [PATCH 083/125] FIX: topic list scrolling was broken on mobile --- .../discourse/templates/mobile/discovery/topics.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs index 3355aef462..5d1a3c8e1b 100644 --- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs @@ -1,4 +1,4 @@ -
    +{{#discovery-topics-list model=model refresh="refresh" incomingCount=topicTrackingState.incomingCount}} {{#if top}}
    {{period-chooser period=period action="changePeriod"}} @@ -19,7 +19,7 @@ hideCategory=model.hideCategory topics=model.topics}} {{/if}} -
    +{{/discovery-topics-list}}