card 1.20.0 → 1.20.1

data/mod/email/set/right/follow.rb

@@ -18,37 +18,50 @@ format :html do
   end
 
   view :follow_item, tags: :unknown_ok, cache: :never do |args|
-    if card.new_card? || !card.include_item?(args[:condition])
-      button_view = :add_follow_rule_button
-      form_opts = { add_item: args[:condition] }
-    else
-      button_view = :delete_follow_rule_button
-      form_opts = { drop_item: args[:condition] }
-    end
-
-    text = if (option_card = Card.fetch args[:condition])
-             option_card.description(card.rule_set)
-           else
-             card.rule_set.follow_label
-           end
-    link_target = if card.rule_set.tag.codename == "self"
-                    card.rule_set_name.left
-                  else
-                    "#{card.rule_set_name}+by name"
-                  end
+    condition = args[:condition]
     wrap do
-      card_form(
-        { action: :update, name: card.name, success: { view: :follow_item } },
-        hidden: { condition: args[:condition] }.merge(form_opts)
-      ) do
-        output [
-          _optional_render(button_view, args),
-          link_to_card(link_target, text)
+      card_form action: :update, success: { view: :follow_item } do
+        [
+          follow_item_hidden_tags(condition),
+          follow_item_button(condition),
+          follow_item_link(condition)
         ]
       end
     end
   end
 
+  def add_follow_item? condition
+    card.new_card? || !card.include_item?(condition)
+  end
+
+  def follow_item_hidden_tags condition
+    condkey = add_follow_item?(condition) ? :add_item : :drop_item
+    hidden_tags condition: condition, condkey => condition
+  end
+
+  def follow_item_button condition
+    action = add_follow_item?(condition) ? :add : :delete
+    _optional_render "#{action}_follow_rule_button"
+  end
+
+  def follow_item_link condition
+    link_to_card follow_item_link_target, follow_item_link_text(condition)
+  end
+
+  def follow_item_link_target
+    set = card.rule_set
+    setname = set.cardname
+    set.tag.codename == "self" ? setname.left : setname.field("by name")
+  end
+
+  def follow_item_link_text condition
+    if (option_card = Card.fetch condition)
+      option_card.description card.rule_set
+    else
+      card.rule_set.follow_label
+    end
+  end
+
   def default_follow_status_args args
     args[:card_key] ||= card.set_prototype.key
   end
@@ -60,9 +73,11 @@ format :html do
   end
 
   def follow_status_link name, key
-    link_to_related key, "more options",
-                    path: { related: { name: name, view: :edit_single_rule } },
-                    class: "btn update-follow-link", "data-card_key" => key
+    # simplified this to straight link for now.
+    # consider restoring to slotter action
+    link_to_card name, "more options",
+                 path: { view: :edit_single_rule },
+                 class: "btn update-follow-link", "data-card_key" => key
   end
 
   view :follow_status_delete_options, cache: :never do
@@ -77,19 +92,17 @@ format :html do
   end
 
   view :delete_follow_rule_button do
-    button_tag(
-      type: :submit,
-      class: "btn-xs btn-item-delete btn-primary", "aria-label" => "Left Align"
-    ) do
+    button_tag(type: :submit,
+               class: "btn-xs btn-item-delete btn-primary",
+               "aria-label" => "Left Align") do
       tag :span, class: "glyphicon glyphicon-ok", "aria-hidden" => "true"
     end
   end
 
   view :add_follow_rule_button do
-    button_tag(
-      type: :submit,
-      class: "btn-xs btn-item-add", "aria-label" => "Left Align"
-    ) do
+    button_tag(type: :submit,
+               class: "btn-xs btn-item-add",
+               "aria-label" => "Left Align") do
       tag :span, class: "glyphicon glyphicon-plus", "aria-hidden" => "true"
     end
   end

data/mod/email/set/type/email_template.rb

@@ -10,82 +10,38 @@ rescue Net::SMTPError => exception
   errors.add :exception, exception.message
 end
 
-def process_email_field field, config, args
-  config[field] =
-    if args[field]
-      args[field]
-    elsif (field_card = fetch(trait: field))
-      # configuration can be anything visible to configurer
-      user = (args[:follower] && Card.fetch(args[:follower])) ||
-             field_card.updater
-      Auth.as(user) do
-        yield(field_card)
-      end
-    else
-      ""
-    end
-end
-
-def process_message_field field, config, args, format, special_args=nil
-  process_email_field(field, config, args) do |field_card|
-    content_args = args.clone
-    content_args.merge! special_args if special_args
-    field_card.contextual_content args[:context], { format: format },
-                                  content_args
-  end
-end
-
-def email_config args={}
-  config = {}
-  args[:context] ||= self
-
-  [:to, :from, :cc, :bcc].each do |field_name|
-    process_email_field(field_name, config, args) do |field_card|
-      field_card.process_email_addresses(
-        args[:context], { format: "email_text" }, args
-      )
-    end
-  end
-  process_email_field(:attach, config, args) do |field_card|
-    field_card.extended_item_contents args[:context]
-  end
-  process_message_field :subject, config, args, "email_text",
-                        content_opts: { chunk_list: :nest_only }
-  process_message_field :text_message, config, args, "email_text"
-  process_message_field :html_message, config, args, "email_html"
+def process_html_message config, args, inline_attachment_url
+  process_message_field(
+    :html_message, config,
+    args.merge(inline_attachment_url: inline_attachment_url),
+    "email_html"
+  )
   if config[:html_message].present?
     config[:html_message] = Card::Mailer.layout config[:html_message]
   end
-
-  from_name, from_email =
-    if config[:from] =~ /(.*)\<(.*)>/
-      [Regexp.last_match(1).strip, Regexp.last_match(2)]
-    else
-      [nil, config[:from]]
-    end
-
-  if (default_from = Card::Mailer.default[:from])
-    config[:from] =
-      if from_email
-        %("#{from_name || from_email}" <#{default_from}>)
-      else
-        default_from
-      end
-    config[:reply_to] ||= config[:from]
-  elsif config[:from].blank?
-    config[:from] = Card[Card::WagnBotID].account.email
-  end
-  config.select { |_k, v| v.present? }
+  config
 end
 
 format do
   view :mail, perms: :none, cache: :never do |args|
-    args = card.email_config(args)
-    text_message = args.delete(:text_message)
-    html_message = args.delete(:html_message)
-    attachment_list = args.delete(:attach)
-    alternative = (text_message.present? && html_message.present?)
-    mail = Card::Mailer.new_mail(args) do
+    config = card.email_config(args)
+    text_message = config.delete(:text_message)
+    attachment_list = config.delete(:attach)
+    email_card = card # card is not accessible in the new_mail block
+    mail = Card::Mailer.new_mail(config) do
+      # inline attachments only work in the binding of this block
+      # so the current solution is to create a lambda here and pass it
+      # to the view where it is needed to create the image tag
+      # (see core view in Type::Image::EmailHtmlFormat)
+      inline_attachment_url =
+        lambda do |path|
+          attachments.inline[path] = ::File.read path
+          attachments[path].url
+        end
+      email_card.process_html_message config, args, inline_attachment_url
+      html_message = config.delete(:html_message)
+      alternative = (text_message.present? && html_message.present?)
+
       if alternative
         if attachment_list && !attachment_list.empty?
           content_type "multipart/mixed"

data/mod/email/set/type/email_template/email_config.rb

@@ -0,0 +1,63 @@
+def email_config args={}
+  config = {}
+  args[:context] ||= self
+
+  [:to, :from, :cc, :bcc].each do |field_name|
+    process_email_field(field_name, config, args) do |field_card|
+      field_card.process_email_addresses(
+        args[:context], { format: "email_text" }, args
+      )
+    end
+  end
+  process_email_field(:attach, config, args) do |field_card|
+    field_card.extended_item_contents args[:context]
+  end
+  process_message_field :subject, config, args, "email_text",
+                        content_opts: { chunk_list: :nest_only }
+  process_message_field :text_message, config, args, "email_text"
+
+  from_name, from_email =
+    if config[:from] =~ /(.*)\<(.*)>/
+      [Regexp.last_match(1).strip, Regexp.last_match(2)]
+    else
+      [nil, config[:from]]
+    end
+
+  if (default_from = Card::Mailer.default[:from])
+    config[:from] =
+      if from_email
+        %("#{from_name || from_email}" <#{default_from}>)
+      else
+        default_from
+      end
+    config[:reply_to] ||= config[:from]
+  elsif config[:from].blank?
+    config[:from] = Card[Card::WagnBotID].account.email
+  end
+  config.select { |_k, v| v.present? }
+end
+
+def process_email_field field, config, args
+  config[field] =
+    if args[field]
+      args[field]
+    elsif (field_card = fetch(trait: field))
+      # configuration can be anything visible to configurer
+      user = (args[:follower] && Card.fetch(args[:follower])) ||
+        field_card.updater
+      Auth.as(user) do
+        yield(field_card)
+      end
+    else
+      ""
+    end
+end
+
+def process_message_field field, config, args, format, special_args=nil
+  process_email_field(field, config, args) do |field_card|
+    content_args = args.clone
+    content_args.merge! special_args if special_args
+    field_card.contextual_content args[:context], { format: format },
+                                  content_args
+  end
+end

data/mod/email/set/type_plus_right/user/follow.rb

@@ -120,9 +120,9 @@ format :html do
                 subformat(rule[:card]).render_follow_item condition: option,
                                                           hide: hide_buttons
               end
-            end.join("\n")
-          end.join("\n")
-        end.join("\n")
+            end
+          end
+        end
       end
     end
   end

data/mod/machines/lib/stylesheets/style_cards.scss

@@ -855,3 +855,295 @@ html>body .open-view {
 }
 
 
+/*-------------------------- */
+/*- ProseMirror            - */
+/*-------------------------- */
+
+.ProseMirror {
+  position: relative;
+}
+
+.ProseMirror {
+  white-space: pre-wrap;
+}
+
+.ProseMirror ul, .ProseMirror ol {
+  padding-left: 30px;
+  cursor: default;
+}
+
+.ProseMirror blockquote {
+  padding-left: 1em;
+  border-left: 3px solid #eee;
+  margin-left: 0; margin-right: 0;
+}
+
+.ProseMirror pre {
+  white-space: pre-wrap;
+}
+
+.ProseMirror li {
+  position: relative;
+  pointer-events: none; /* Don't do weird stuff with marker clicks */
+}
+.ProseMirror li > * {
+  pointer-events: auto;
+}
+
+.ProseMirror-nodeselection *::selection, .ProseMirror-widget *::selection { background: transparent; }
+.ProseMirror-nodeselection *::-moz-selection, .ProseMirror-widget *::-moz-selection { background: transparent; }
+
+.ProseMirror-selectednode {
+  outline: 2px solid #8cf;
+}
+
+/* Make sure li selections wrap around markers */
+
+li.ProseMirror-selectednode {
+  outline: none;
+}
+
+li.ProseMirror-selectednode:after {
+  content: "";
+  position: absolute;
+  left: -32px;
+  right: -2px; top: -2px; bottom: -2px;
+  border: 2px solid #8cf;
+  pointer-events: none;
+}
+
+
+.ProseMirror-textblock-dropdown {
+  min-width: 3em;
+}
+
+.ProseMirror-menu {
+  margin: 0 -4px;
+  line-height: 1;
+}
+
+.ProseMirror-tooltip .ProseMirror-menu {
+  width: -webkit-fit-content;
+  width: fit-content;
+  white-space: pre;
+}
+
+.ProseMirror-menuitem {
+  margin-right: 3px;
+  display: inline-block;
+}
+
+.ProseMirror-menuseparator {
+  border-right: 1px solid #ddd;
+  margin-right: 3px;
+}
+
+.ProseMirror-menu-dropdown, .ProseMirror-menu-dropdown-menu {
+  font-size: 90%;
+  white-space: nowrap;
+}
+
+.ProseMirror-menu-dropdown {
+  vertical-align: 1px;
+  cursor: pointer;
+}
+
+.ProseMirror-menu-dropdown-wrap {
+  padding: 1px 14px 1px 4px;
+  display: inline-block;
+  position: relative;
+}
+
+.ProseMirror-menu-dropdown:after {
+  content: "";
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid currentColor;
+  opacity: .6;
+  position: absolute;
+  right: 2px;
+  top: calc(50% - 2px);
+}
+
+.ProseMirror-menu-dropdown-menu, .ProseMirror-menu-submenu {
+  position: absolute;
+  background: white;
+  color: #666;
+  border: 1px solid #aaa;
+  padding: 2px;
+}
+
+.ProseMirror-menu-dropdown-menu {
+  z-index: 15;
+  min-width: 6em;
+}
+
+.ProseMirror-menu-dropdown-item {
+  cursor: pointer;
+  padding: 2px 8px 2px 4px;
+}
+
+.ProseMirror-menu-dropdown-item:hover {
+  background: #f2f2f2;
+}
+
+.ProseMirror-menu-submenu-wrap {
+  position: relative;
+  margin-right: -4px;
+}
+
+.ProseMirror-menu-submenu-label:after {
+  content: "";
+  border-top: 4px solid transparent;
+  border-bottom: 4px solid transparent;
+  border-left: 4px solid currentColor;
+  opacity: .6;
+  position: absolute;
+  right: 4px;
+  top: calc(50% - 4px);
+}
+
+.ProseMirror-menu-submenu {
+  display: none;
+  min-width: 4em;
+  left: 100%;
+  top: -3px;
+}
+
+.ProseMirror-menu-active {
+  background: #eee;
+  border-radius: 4px;
+}
+
+.ProseMirror-menu-active {
+  background: #eee;
+  border-radius: 4px;
+}
+
+.ProseMirror-menu-disabled {
+  opacity: .3;
+}
+
+.ProseMirror-menu-submenu-wrap:hover .ProseMirror-menu-submenu, .ProseMirror-menu-submenu-wrap-active .ProseMirror-menu-submenu {
+  display: block;
+}
+
+.ProseMirror-menubar {
+  border-top-left-radius: inherit;
+  border-top-right-radius: inherit;
+  position: relative;
+  min-height: 1em;
+  color: #666;
+  padding: 1px 6px;
+  top: 0; left: 0; right: 0;
+  border-bottom: 1px solid silver;
+  background: white;
+  z-index: 10;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  overflow: visible;
+}
+
+.ProseMirror-icon {
+  display: inline-block;
+  line-height: .8;
+  vertical-align: -2px; /* Compensate for padding */
+  padding: 2px 8px;
+  cursor: pointer;
+}
+
+.ProseMirror-icon svg {
+  fill: currentColor;
+  height: 1em;
+}
+
+.ProseMirror-icon span {
+  vertical-align: text-top;
+}
+
+
+
+/* Add space around the hr to make clicking it easier */
+
+.ProseMirror-example-setup-style hr {
+  position: relative;
+  height: 6px;
+  border: none;
+}
+
+.ProseMirror-example-setup-style hr:after {
+  content: "";
+  position: absolute;
+  left: 10px;
+  right: 10px;
+  top: 2px;
+  border-top: 2px solid silver;
+}
+
+.ProseMirror-example-setup-style img {
+  cursor: default;
+}
+
+.ProseMirror-example-setup-style table {
+  border-collapse: collapse;
+}
+
+.ProseMirror-example-setup-style td {
+  vertical-align: top;
+  border: 1px solid #ddd;
+  padding: 3px 5px;
+}
+
+.ProseMirror-prompt {
+  background: white;
+  padding: 5px 10px 5px 15px;
+  border: 1px solid silver;
+  position: fixed;
+  border-radius: 3px;
+  z-index: 11;
+  box-shadow: -.5px 2px 5px rgba(0, 0, 0, .2);
+}
+
+.ProseMirror-prompt h5 {
+  margin: 0;
+  font-weight: normal;
+  font-size: 100%;
+  color: #444;
+}
+
+.ProseMirror-prompt input[type="text"],
+.ProseMirror-prompt textarea {
+  background: #eee;
+  border: none;
+  outline: none;
+}
+
+.ProseMirror-prompt input[type="text"] {
+  padding: 0 4px;
+}
+
+.ProseMirror-prompt-close {
+  position: absolute;
+  left: 2px; top: 1px;
+  color: #666;
+  border: none; background: transparent; padding: 0;
+}
+
+.ProseMirror-prompt-close:after {
+  content: "✕";
+  font-size: 12px;
+}
+
+.ProseMirror-invalid {
+  background: #ffc;
+  border: 1px solid #cc7;
+  border-radius: 4px;
+  padding: 5px 10px;
+  position: absolute;
+  min-width: 10em;
+}
+
+.ProseMirror-prompt-buttons {
+  margin-top: 5px;
+  display: none;
+}