card 1.96.0 → 1.96.1

data/mod/standard/set/all/rich_html/toolbar.rb

@@ -212,12 +212,17 @@ format :html do
 
   view :delete_button do
     confirm = "Are you sure you want to delete #{safe_name}?"
-    success = main? ? "REDIRECT: *previous" : "TEXT: #{card.name} deleted"
+    success = main? ? "REDIRECT: *previous" : { view: :just_deleted }
     toolbar_button "delete", :trash,
                    path: { action: :delete, success: success },
                    class: "slotter", remote: true, 'data-confirm': confirm
   end
 
+  # TODO: add undo functionality
+  view :just_deleted, tag: :unknown_ok do
+    wrap { "#{render_title} deleted" }
+  end
+
   def toolbar_button text, symbol, opts={}
     link_text = toolbar_button_text text, symbol, opts.delete(:hide)
     opts[:class] = [opts[:class], "btn btn-primary"].compact * " "

data/mod/standard/set/type/list.rb

@@ -1,18 +1,14 @@
 include_set Pointer
 
 event :validate_list_name, :validate, on: :save, changed: :name do
-  if !junction? || !right || right.type_id != CardtypeID
-    errors.add :name, "must have a cardtype name as right part"
-  end
+  errors.add :name, tr(:type_right) if !junction? || !right || right.type_id != CardtypeID
 end
 
 event :validate_list_item_type_change, :validate,
       on: :save, changed: :name do
   item_cards.each do |item_card|
     next unless item_card.type_name.key != item_type_name.key
-    errors.add :name,
-               "name conflicts with list items' type; " \
-               "delete content first"
+    errors.add :name, tr(:conflict_item_type)
   end
 end
 
@@ -20,9 +16,11 @@ event :validate_list_content, :validate,
       on: :save, changed: :content do
   item_cards.each do |item_card|
     next unless item_card.type_name.key != item_type_name.key
-    errors.add :content,
-               "#{item_card.name} has wrong cardtype; " \
-               "only cards of type #{name.right} are allowed"
+    errors.add :content, tr(
+      :only_type_allowed,
+      cardname: item_card.name,
+      cardtype: name.right
+    )
   end
 end
 

data/mod/standard/set/type/number.rb

@@ -6,7 +6,7 @@ format :html do
 end
 
 event :validate_number, :validate, on: :save do
-  errors.add :content, "'#{content}' is not numeric" unless valid_number?(content)
+  errors.add :content, tr(:not_numeric, content: content) unless valid_number?(content)
 end
 
 def valid_number? string

data/mod/standard/set/type/session.rb

@@ -23,7 +23,7 @@ def content
 end
 
 def content= val
-  Env.session[key] = val
+  self.db_content = Env.session[key] = val
 end
 
 format :html do

data/mod/standard/spec/content/chunk/link_spec.rb

@@ -57,9 +57,9 @@ RSpec.describe Card::Content::Chunk::Link do
   end
 
   it "handles relative urls" do
-    assert_link "[[/recent]]", class: "internal-link",
-                               href: "/recent",
-                               text: "/recent"
+    assert_link "[[/*recent]]", class: "internal-link",
+                                href: "/*recent",
+                                text: "/*recent"
   end
 
   it "handles absolute urls" do

data/mod/utility/set/abstract/media.rb

@@ -12,16 +12,20 @@ format :html do
     image_card&.name
   end
 
-  def text_with_image_args opts
-    opts.reverse_merge! title: _render_title, text: "", src: image_src(opts),
-                        alt: image_alt, size: :original
-  end
-
   def text_with_image opts={}
-    class_up "media-left", "m-2"
     @image_card = Card.cardish(opts[:image]) if opts[:image]
-    opts[:media_opts] = {} unless opts[:media_opts]
-    text_with_image_args opts
-    haml :media_snippet, opts
+    haml :media_snippet, normalized_text_with_image_opts(opts)
+  end
+
+  private
+
+  def normalized_text_with_image_opts opts
+    opts.reverse_merge! title: _render_title,
+                        text: "",
+                        src: image_src(opts),
+                        alt: image_alt,
+                        size: :original,
+                        media_opts: {},
+                        media_left_extras: ""
   end
 end

data/mod/utility/set/abstract/media/media_snippet.haml

@@ -1,7 +1,9 @@
 .media{media_opts}
-  .image-box{class: [classy("media-left"), size]}
-    %a{href: "#"}
-      %img.media-object{class: size, src: src.html_safe, alt: alt}
+  .media-left
+    .image-box{class: "mr-1 #{size}"}
+      %a{href: "#"}
+        %img.media-object{class: size, src: src.html_safe, alt: alt}
+    = media_left_extras
   .media-body
     - if title != ""
       %h5.media-heading

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.96.0
+  version: 1.96.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -317,6 +317,7 @@ files:
 - config/initializers/uuid_state_file.rb
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/es.yml
 - db/migrate/20110511221913_require_earlier_migrations.rb
 - db/migrate/20120105203350_require_1_8_migrations.rb
 - db/migrate/20121111025347_require_1_10_migrations.rb
@@ -410,8 +411,8 @@ files:
 - db/migrate_core_cards/data/1.14_config_descriptions_etc.json
 - db/migrate_core_cards/data/bootstrap_layout.json
 - db/migrate_core_cards/data/cards.yml
-- db/migrate_core_cards/data/cards/*header
-- db/migrate_core_cards/data/cards/*main_menu
+- db/migrate_core_cards/data/cards/Xheader
+- db/migrate_core_cards/data/cards/Xmain_menu
 - db/migrate_core_cards/data/mailer/follower_notification_email.html
 - db/migrate_core_cards/data/mailer/follower_notification_email.txt
 - db/migrate_core_cards/data/mailer/mail_config.json
@@ -1048,7 +1049,9 @@ files:
 - mod/admin/set/self/recaptcha_public_key.rb
 - mod/admin/set/self/trash.rb
 - mod/admin/set/self/version.rb
+- mod/admin/spec/set/self/admin_info_spec.rb
 - mod/admin/spec/set/self/admin_spec.rb
+- mod/admin/spec/set/self/trash_spec.rb
 - mod/admin/spec/set/self/version_spec.rb
 - mod/basic_formats/format/css_format.rb
 - mod/basic_formats/format/csv_format.rb
@@ -1071,6 +1074,7 @@ files:
 - mod/basic_formats/spec/set/all/all_csv_spec.rb
 - mod/basic_formats/spec/set/all/base_spec.rb
 - mod/basic_formats/spec/set/all/file_spec.rb
+- mod/basic_formats/spec/set/all/head_spec.rb
 - mod/basic_formats/spec/set/all/json_spec.rb
 - mod/basic_formats/spec/set/all/rss_spec.rb
 - mod/basic_formats/spec/set/all/text_spec.rb
@@ -1293,6 +1297,7 @@ files:
 - mod/bootstrap/spec/set/all/bootstrap/horizontal_form_spec.rb
 - mod/bootstrap/spec/set/all/bootstrap/layout_spec.rb
 - mod/bootstrap/spec/set/type/bootswatch_skin_spec.rb
+- mod/bootstrap/spec/set/type/customized_bootswatch_skin/html_views_spec.rb
 - mod/bootstrap/spec/set/type/customized_bootswatch_skin_spec.rb
 - mod/bootstrap/spec/set/type_plus_right/customized_bootswatch_skin/colors_spec.rb
 - mod/bootstrap/vendor/bootstrap-colorpicker/Gruntfile.js
@@ -3901,6 +3906,7 @@ files:
 - mod/core/spec/format/data_format_spec.rb
 - mod/core/spec/format/html_format_spec.rb
 - mod/core/spec/format/text_format_spec.rb
+- mod/core/spec/set/abstract/code_file_spec.rb
 - mod/core/spec/set/all/actify_spec.rb
 - mod/core/spec/set/all/active_card_spec.rb
 - mod/core/spec/set/all/assign_attributes_spec.rb
@@ -3926,6 +3932,7 @@ files:
 - mod/core/spec/set/all/rules2_spec.rb
 - mod/core/spec/set/all/rules_spec.rb
 - mod/core/spec/set/all/states_spec.rb
+- mod/core/spec/set/all/tabs_spec.rb
 - mod/core/spec/set/all/templating_spec.rb
 - mod/core/spec/set/all/trash_spec.rb
 - mod/core/spec/set/all/type_spec.rb
@@ -4632,6 +4639,7 @@ files:
 - mod/developer/set/all/view_viz.rb
 - mod/developer/set/right/debug.rb
 - mod/developer/spec/set/all/event_viz_spec.rb
+- mod/developer/spec/set/all/view_viz_spec.rb
 - mod/developer/spec/set/right/debug_spec.rb
 - mod/email/README
 - mod/email/format/email_html_format.rb
@@ -4678,10 +4686,13 @@ files:
 - mod/follow/set/type_plus_right/user/follow.rb
 - mod/follow/set/type_plus_right/user/follow/follow_editor.haml
 - mod/follow/set/type_plus_right/user/follow/follow_editor_helper.rb
+- mod/follow/spec/set/all/follow/follow_link_spec.rb
 - mod/follow/spec/set/all/follow_spec.rb
+- mod/follow/spec/set/all/notify/html_views_spec.rb
 - mod/follow/spec/set/all/notify_email.txt
 - mod/follow/spec/set/all/notify_spec.rb
 - mod/follow/spec/set/right/account_spec.rb
+- mod/follow/spec/set/right/follow_spec.rb
 - mod/follow/spec/set/right/followers_spec.rb
 - mod/follow/spec/set/right/following_spec.rb
 - mod/follow/spec/set/self/follow_defaults_spec.rb
@@ -4702,11 +4713,15 @@ files:
 - mod/history/set/all/acts.rb
 - mod/history/set/all/content_history.rb
 - mod/history/set/all/history.rb
+- mod/history/spec/set/all/act_view_spec.rb
+- mod/history/spec/set/all/action_view_spec.rb
+- mod/history/spec/set/all/history_spec.rb
 - mod/item/set/all/bar.haml
 - mod/item/set/all/bar.rb
 - mod/item/set/all/box.haml
 - mod/item/set/all/box.rb
 - mod/item/set/all/expanded_bar.haml
+- mod/item/spec/set/all/bar_spec.rb
 - mod/machines/file/all_script_machine_output/file.js
 - mod/machines/file/all_style_machine_output/file.css
 - mod/machines/file/script_html5shiv_printshiv_machine_output/file.js
@@ -4910,6 +4925,7 @@ files:
 - mod/search/set/self/search.rb
 - mod/search/set/type/search_type.rb
 - mod/search/spec/set/abstract/filter_spec.rb
+- mod/search/spec/set/abstract/search_spec.rb
 - mod/search/spec/set/self/navbox_spec.rb
 - mod/search/spec/set/self/recent_spec.rb
 - mod/search/spec/set/self/search_spec.rb