Merge pull request #986 from indentlabs/jul-18-changes

Document table changes & other polish

Author: drusepth

app/assets/javascripts/icon-translation.js

@@ -0,0 +1,3 @@
+$(document).ready(function () {
+  $('.material-icons').attr('translate', 'no');
+});

app/controllers/contributors_controller.rb

@@ -9,7 +9,7 @@ def destroy
 
       # Create a notification letting the user know!
       user.notifications.create(
-        message_html:     "<div>You have been removed as a contributor from the <span class='#{Universe.color}-text'>#{relevant_universe.name}</span> universe.</div>",
+        message_html:     "<div>You have been removed as a contributor from the <span class='#{Universe.text_color}'>#{relevant_universe.name}</span> universe.</div>",
         icon:             Universe.icon,
         icon_color:       Universe.color,
         happened_at:      DateTime.current,
@@ -18,7 +18,7 @@ def destroy
 
       # Create a notification letting the universe owner know
       relevant_universe.user.notifications.create(
-        message_html:     "<div><span class='#{User.color}-text'>#{user.display_name}</span> has stopped collaborating on your <span class='#{Universe.color}-text'>#{relevant_universe.name}</span> universe.</div>",
+        message_html:     "<div><span class='#{User.text_color}'>#{user.display_name}</span> has stopped collaborating on your <span class='#{Universe.text_color}'>#{relevant_universe.name}</span> universe.</div>",
         icon:             Universe.icon,
         icon_color:       Universe.color,
         happened_at:      DateTime.current,

app/controllers/documents_controller.rb

@@ -32,6 +32,9 @@ def index
       .where(context: 'Document', parent_folder_id: nil)
       .order('title ASC')
 
+    # TODO: can we reuse this content to skip a few queries in this controller action?
+    cache_linkable_content_for_each_content_type
+
     # TODO: all of this filtering code is repeated everywhere and would be nice to abstract out somewhere
     if params.key?(:favorite_only)
       @documents = @documents.where(favorite: true)

app/controllers/page_collection_submissions_controller.rb

@@ -64,7 +64,7 @@ def approve
 
     # Create a notification for the submitter to let them know it's been accepted
     @page_collection_submission.user.notifications.create(
-      message_html:     "<div>Your <span class='#{@page_collection_submission.content.class.color}-text'>#{@page_collection_submission.content.name}</span> #{@page_collection_submission.content_type.downcase} submission to <span class='#{PageCollection.color}-text'>#{@page_collection_submission.page_collection.title}</span> was approved!</div>",
+      message_html:     "<div>Your <span class='#{@page_collection_submission.content.class.text_color}'>#{@page_collection_submission.content.name}</span> #{@page_collection_submission.content_type.downcase} submission to <span class='#{PageCollection.text_color}'>#{@page_collection_submission.page_collection.title}</span> was approved!</div>",
       icon:             PageCollection.icon,
       icon_color:       PageCollection.color,
       happened_at:      DateTime.current,

app/controllers/registrations_controller.rb

@@ -84,7 +84,7 @@ def add_account
         # Create a notification letting the user know about each collaboration!
         potential_contributor_records.each do |contributorship|
           resource.notifications.create(
-            message_html:     "<div>You have been added as a contributor to the <span class='#{Universe.color}-text'>#{contributorship.universe.name}</span> universe.</div>",
+            message_html:     "<div>You have been added as a contributor to the <span class='#{Universe.text_color}'>#{contributorship.universe.name}</span> universe.</div>",
             icon:             Universe.icon,
             icon_color:       Universe.color,
             happened_at:      DateTime.current,

app/controllers/user_followings_controller.rb

@@ -30,7 +30,7 @@ def create
 
       # Create a notification letting the user know!
       @user_following.followed_user.notifications.create(
-        message_html:     "<div><span class='#{User.color}-text'>#{@user_following.user.display_name}</span> is now following your public updates.</div>",
+        message_html:     "<div><span class='#{User.text_color}'>#{@user_following.user.display_name}</span> is now following your public updates.</div>",
         icon:             User.icon,
         icon_color:       User.color,
         happened_at:      DateTime.current,

app/jobs/content_page_share_notification_job.rb

@@ -13,7 +13,7 @@ def perform(*args)
       next if comment.user == following.user
 
       following.user.notifications.create(
-        message_html:     "<div><span class='#{User.color}-text'>#{comment.user.display_name}</span> commented on #{comment.user == comment.content_page_share.content_page.user ? 'the' : 'your'} shared #{comment.content_page_share.content_page.class.name.downcase} <span class='#{comment.content_page_share.content_page.class.color}-text'>#{comment.content_page_share.content_page.name}</span>.</div>",
+        message_html:     "<div><span class='#{User.text_color}'>#{comment.user.display_name}</span> commented on #{comment.user == comment.content_page_share.content_page.user ? 'the' : 'your'} shared #{comment.content_page_share.content_page.class.name.downcase} <span class='#{comment.content_page_share.content_page.class.text_color}'>#{comment.content_page_share.content_page.name}</span>.</div>",
         icon:             comment.content_page_share.content_page.class.icon,
         icon_color:       comment.content_page_share.content_page.class.color,
         happened_at:      DateTime.current,

app/jobs/document_analysis_job.rb

@@ -38,7 +38,7 @@ def perform(*args)
 
     # Create a notification letting the user know!
     analysis.document.user.notifications.create(
-      message_html:     "<div>An analysis of <span class='#{Document.color}-text'>#{analysis.document.title}</span> is ready to view.</div>",
+      message_html:     "<div>An analysis of <span class='#{Document.text_color}'>#{analysis.document.title}</span> is ready to view.</div>",
       icon:             Document.icon,
       icon_color:       Document.color,
       happened_at:      DateTime.current,

app/models/application_integration.rb

@@ -14,6 +14,10 @@ def self.color
     'orange'
   end
 
+  def self.text_color
+    'orange-text'
+  end
+
   def generate_new_access_token!
     self.update(application_token: SecureRandom.hex(24))
   end

app/models/documents/document.rb

@@ -32,10 +32,18 @@ def self.color
     'teal'
   end
 
+  def self.text_color
+    'teal-text'
+  end
+
   def color
     Document.color
   end
 
+  def text_color
+    Document.text_color
+  end
+
   def self.hex_color
     '#009688'
   end