card 1.17.4 → 1.18.0

data/db/migrate_core_cards/20150610180019_add_recaptcha_key_and_admin_info_cards.rb

@@ -39,7 +39,7 @@ class AddRecaptchaKeyAndAdminInfoCards < Card::CoreMigration
                         "[[+private key]]\n" \
                         '[[+proxy]]'
     Card::Cache.reset_all
-    ['public_key', 'private_key', 'proxy'].each do |name|
+    %w(public_key private_key proxy).each do |name|
       Card.create!(
         name: "#{Card[:recaptcha_settings].name}+#{name.tr('_', ' ')}",
         codename: "recaptcha_#{name}"
@@ -48,16 +48,10 @@ class AddRecaptchaKeyAndAdminInfoCards < Card::CoreMigration
   end
 
   def admin_only args
-    shared_args = { type_id: Card::PhraseID,
-                    subcards: {
-                      '+*self+*read' => { content: '[[Administrator]]' },
-                      '+*self+*update' => { content: '[[Administrator]]' },
-                      '+*self+*delete' => { content: '[[Administrator]]' }
-                    }
-                  }
-    if args[:subcards]
-      shared_args[:subcards].merge! args.delete(:subcards)
+    create_or_update args.reverse_merge(type_id: Card::PhraseID)
+    %w(*read *update *delete).each do |perm|
+      create_or_update name: "#{args[:name]}+*self+#{perm}",
+                       content: '[[Administrator]]'
     end
-    create_or_update shared_args.merge(args)
   end
 end

data/db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb

@@ -1,11 +1,10 @@
 # -*- encoding : utf-8 -*-
 
 class UpdateFileAndImageCards < Card::CoreMigration
-
   def get_new_file_name filename
     original_filename = filename
     if filename =~ /^(icon|small|medium|large|original)-([^.]+).(.+)$/
-      filename = "#{$2}-#{$1}.#{$3}"
+      filename = "#{Regexp.last_match(2)}-#{Regexp.last_match(1)}.#{Regexp.last_match(3)}"
     end
     filename = filename.downcase
     filename if filename != original_filename
@@ -17,11 +16,10 @@ class UpdateFileAndImageCards < Card::CoreMigration
       card.update_attributes! codename: 'credit_image'
     end
     %w( cerulean_skin cosmo_skin cyborg_skin darkly_skin flatly_skin journal_skin lumen_skin paper_skin readable_skin sandstone_skin simplex_skin slate_skin spacelab_skin superhero_skin united_skin yeti_skin ).each do |name|
-      if (card=Card[name.to_sym])
-        card.update_attributes! codename: nil
-        if (card = Card.fetch "#{name}+image")
-          card.update_attributes! codename: "#{name}_image"
-        end
+      next unless (card = Card[name.to_sym])
+      card.update_attributes! codename: nil
+      if (card = Card.fetch "#{name}+image")
+        card.update_attributes! codename: "#{name}_image"
       end
     end
 
@@ -33,38 +31,34 @@ class UpdateFileAndImageCards < Card::CoreMigration
           action.update_attributes! comment: original_filename
         end
       end
-      if card.content.present?
-        attach_array = card.content.split "\n"
-        attach_array[0].match(/\.(.+)$/) do |match|
-          extension = $1
-          if attach_array.size > 3  # mod file
-            card.update_column :db_content, ":#{card.codename}/#{attach_array[3]}.#{extension}"
-          else
-            card.update_column :db_content, "~#{card.id}/#{card.last_action_id}.#{extension}"
-          end
-          # swap variant and action_id/type_code in file name
-          if Dir.exist? card.store_dir
-            symlink_target_hash = Hash.new
-            Dir.entries(card.store_dir).each do |file|
-              if new_filename = get_new_file_name(file)
-                file_path = File.join(card.store_dir, file)
-                if File.symlink?(file_path)
-                  symlink_target_hash[new_filename] = File.readlink(file_path)
-                  File.unlink file_path
-                else
-                  FileUtils.mv file_path, File.join(card.store_dir, new_filename)
-                end
-              end
-            end
-            symlink_target_hash.each do |symlink,target|
-              new_target_name = get_new_file_name(target)
-              File.symlink File.join(card.store_dir,new_target_name),File.join(card.store_dir,symlink)
+      next unless card.content.present?
+      attach_array = card.content.split "\n"
+      attach_array[0].match(/\.(.+)$/) do |_match|
+        extension = Regexp.last_match(1)
+        if attach_array.size > 3  # mod file
+          card.update_column :db_content, ":#{card.codename}/#{attach_array[3]}.#{extension}"
+        else
+          card.update_column :db_content, "~#{card.id}/#{card.last_action_id}.#{extension}"
+        end
+        # swap variant and action_id/type_code in file name
+        if Dir.exist? card.store_dir
+          symlink_target_hash = {}
+          Dir.entries(card.store_dir).each do |file|
+            next unless new_filename = get_new_file_name(file)
+            file_path = File.join(card.store_dir, file)
+            if File.symlink?(file_path)
+              symlink_target_hash[new_filename] = File.readlink(file_path)
+              File.unlink file_path
+            else
+              FileUtils.mv file_path, File.join(card.store_dir, new_filename)
             end
           end
+          symlink_target_hash.each do |symlink, target|
+            new_target_name = get_new_file_name(target)
+            File.symlink File.join(card.store_dir, new_target_name), File.join(card.store_dir, symlink)
+          end
         end
       end
     end
-
   end
-
 end

data/db/migrate_core_cards/20150824135418_update_file_history.rb

@@ -4,22 +4,18 @@ class UpdateFileHistory < Card::CoreMigration
   def up
     Card.search(type: [:in, 'file', 'image']).each do |card|
       card.actions.each do |action|
-        if (content_change = action.change_for(:db_content).first)
-          original_filename, file_type, action_id, mod  = content_change.value.split("\n")
-          if file_type.present? && action_id.present?
-            value =
-              if mod.present?
-                ":#{card.codename}/#{mod}#{::File.extname(original_filename)}"
-              else
-                "~#{card.id}/#{action_id}#{::File.extname(original_filename)}"
-              end
-            content_change.update_attributes! value: value
+        next unless (content_change = action.change_for(:db_content).first)
+        original_filename, file_type, action_id, mod = content_change.value.split("\n")
+        next unless file_type.present? && action_id.present?
+        value =
+          if mod.present?
+            ":#{card.codename}/#{mod}#{::File.extname(original_filename)}"
+          else
+            "~#{card.id}/#{action_id}#{::File.extname(original_filename)}"
           end
-        end
+        content_change.update_attributes! value: value
       end
     end
-    Card.search( right: { codename: 'machine_output' } ).each do |card|
-      card.delete!
-    end
+    Card.search(right: { codename: 'machine_output' }).each(&:delete!)
   end
 end

data/db/migrate_core_cards/20150903130006_attachment_upload_cards.rb

@@ -8,7 +8,7 @@ class AttachmentUploadCards < Card::CoreMigration
                  codename: 'new_image', empty_ok: true
 
     if (js_output = Card['*all+*script+*machine output'])
-      #perhaps too narrow?
+      # perhaps too narrow?
       js_output.delete!
     end
   end

data/db/schema.rb

@@ -11,123 +11,121 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160122153608) do
-
-  create_table "card_actions", force: :cascade do |t|
-    t.integer "card_id",         limit: 4
-    t.integer "card_act_id",     limit: 4
-    t.integer "super_action_id", limit: 4
-    t.integer "action_type",     limit: 4
-    t.boolean "draft"
-    t.text    "comment",         limit: 65535
+ActiveRecord::Schema.define(version: 20_160_122_153_608) do
+  create_table 'card_actions', force: :cascade do |t|
+    t.integer 'card_id',         limit: 4
+    t.integer 'card_act_id',     limit: 4
+    t.integer 'super_action_id', limit: 4
+    t.integer 'action_type',     limit: 4
+    t.boolean 'draft'
+    t.text    'comment',         limit: 65_535
   end
 
-  add_index "card_actions", ["card_act_id"], name: "card_actions_card_act_id_index", using: :btree
-  add_index "card_actions", ["card_id"], name: "card_actions_card_id_index", using: :btree
+  add_index 'card_actions', ['card_act_id'], name: 'card_actions_card_act_id_index', using: :btree
+  add_index 'card_actions', ['card_id'], name: 'card_actions_card_id_index', using: :btree
 
-  create_table "card_acts", force: :cascade do |t|
-    t.integer  "card_id",    limit: 4
-    t.integer  "actor_id",   limit: 4
-    t.datetime "acted_at"
-    t.string   "ip_address", limit: 255
+  create_table 'card_acts', force: :cascade do |t|
+    t.integer  'card_id',    limit: 4
+    t.integer  'actor_id',   limit: 4
+    t.datetime 'acted_at'
+    t.string   'ip_address', limit: 255
   end
 
-  add_index "card_acts", ["acted_at"], name: "acts_acted_at_index", using: :btree
-  add_index "card_acts", ["actor_id"], name: "card_acts_actor_id_index", using: :btree
-  add_index "card_acts", ["card_id"], name: "card_acts_card_id_index", using: :btree
+  add_index 'card_acts', ['acted_at'], name: 'acts_acted_at_index', using: :btree
+  add_index 'card_acts', ['actor_id'], name: 'card_acts_actor_id_index', using: :btree
+  add_index 'card_acts', ['card_id'], name: 'card_acts_card_id_index', using: :btree
 
-  create_table "card_changes", force: :cascade do |t|
-    t.integer "card_action_id", limit: 4
-    t.integer "field",          limit: 4
-    t.text    "value",          limit: 16777215
+  create_table 'card_changes', force: :cascade do |t|
+    t.integer 'card_action_id', limit: 4
+    t.integer 'field',          limit: 4
+    t.text    'value',          limit: 16_777_215
   end
 
-  add_index "card_changes", ["card_action_id"], name: "card_changes_card_action_id_index", using: :btree
+  add_index 'card_changes', ['card_action_id'], name: 'card_changes_card_action_id_index', using: :btree
 
-  create_table "card_references", force: :cascade do |t|
-    t.integer "referer_id",  limit: 4,   default: 0,  null: false
-    t.string  "referee_key", limit: 255, default: "", null: false
-    t.integer "referee_id",  limit: 4
-    t.string  "ref_type",    limit: 1,   default: "", null: false
-    t.integer "present",     limit: 4
+  create_table 'card_references', force: :cascade do |t|
+    t.integer 'referer_id',  limit: 4,   default: 0,  null: false
+    t.string  'referee_key', limit: 255, default: '', null: false
+    t.integer 'referee_id',  limit: 4
+    t.string  'ref_type',    limit: 1,   default: '', null: false
+    t.integer 'present',     limit: 4
   end
 
-  add_index "card_references", ["ref_type"], name: "card_references_ref_type_index", using: :btree
-  add_index "card_references", ["referee_id"], name: "card_references_referee_id_index", using: :btree
-  add_index "card_references", ["referee_key"], name: "card_references_referee_key_index", using: :btree
-  add_index "card_references", ["referer_id"], name: "card_references_referer_id_index", using: :btree
+  add_index 'card_references', ['ref_type'], name: 'card_references_ref_type_index', using: :btree
+  add_index 'card_references', ['referee_id'], name: 'card_references_referee_id_index', using: :btree
+  add_index 'card_references', ['referee_key'], name: 'card_references_referee_key_index', using: :btree
+  add_index 'card_references', ['referer_id'], name: 'card_references_referer_id_index', using: :btree
 
-  create_table "card_revisions", force: :cascade do |t|
-    t.datetime "created_at",               null: false
-    t.integer  "card_id",    limit: 4,     null: false
-    t.integer  "creator_id", limit: 4,     null: false
-    t.text     "content",    limit: 65535, null: false
+  create_table 'card_revisions', force: :cascade do |t|
+    t.datetime 'created_at',               null: false
+    t.integer  'card_id',    limit: 4,     null: false
+    t.integer  'creator_id', limit: 4,     null: false
+    t.text     'content',    limit: 65_535, null: false
   end
 
-  add_index "card_revisions", ["card_id"], name: "revisions_card_id_index", using: :btree
-  add_index "card_revisions", ["creator_id"], name: "revisions_created_by_index", using: :btree
-
-  create_table "cards", force: :cascade do |t|
-    t.string   "name",                limit: 255,      null: false
-    t.string   "key",                 limit: 255,      null: false
-    t.string   "codename",            limit: 255
-    t.integer  "left_id",             limit: 4
-    t.integer  "right_id",            limit: 4
-    t.integer  "current_revision_id", limit: 4
-    t.datetime "created_at",                           null: false
-    t.datetime "updated_at",                           null: false
-    t.integer  "creator_id",          limit: 4,        null: false
-    t.integer  "updater_id",          limit: 4,        null: false
-    t.string   "read_rule_class",     limit: 255
-    t.integer  "read_rule_id",        limit: 4
-    t.integer  "references_expired",  limit: 4
-    t.boolean  "trash",                                null: false
-    t.integer  "type_id",             limit: 4,        null: false
-    t.text     "db_content",          limit: 16777215
+  add_index 'card_revisions', ['card_id'], name: 'revisions_card_id_index', using: :btree
+  add_index 'card_revisions', ['creator_id'], name: 'revisions_created_by_index', using: :btree
+
+  create_table 'cards', force: :cascade do |t|
+    t.string   'name',                limit: 255,      null: false
+    t.string   'key',                 limit: 255,      null: false
+    t.string   'codename',            limit: 255
+    t.integer  'left_id',             limit: 4
+    t.integer  'right_id',            limit: 4
+    t.integer  'current_revision_id', limit: 4
+    t.datetime 'created_at',                           null: false
+    t.datetime 'updated_at',                           null: false
+    t.integer  'creator_id',          limit: 4,        null: false
+    t.integer  'updater_id',          limit: 4,        null: false
+    t.string   'read_rule_class',     limit: 255
+    t.integer  'read_rule_id',        limit: 4
+    t.integer  'references_expired',  limit: 4
+    t.boolean  'trash',                                null: false
+    t.integer  'type_id',             limit: 4,        null: false
+    t.text     'db_content',          limit: 16_777_215
   end
 
-  add_index "cards", ["created_at"], name: "cards_created_at_index", using: :btree
-  add_index "cards", ["key"], name: "cards_key_index", unique: true, using: :btree
-  add_index "cards", ["left_id"], name: "cards_left_id_index", using: :btree
-  add_index "cards", ["name"], name: "cards_name_index", using: :btree
-  add_index "cards", ["read_rule_id"], name: "cards_read_rule_id_index", using: :btree
-  add_index "cards", ["right_id"], name: "cards_right_id_index", using: :btree
-  add_index "cards", ["type_id"], name: "cards_type_id_index", using: :btree
-  add_index "cards", ["updated_at"], name: "cards_updated_at_index", using: :btree
-
-  create_table "schema_migrations_core_cards", id: false, force: :cascade do |t|
-    t.string "version", limit: 255, null: false
+  add_index 'cards', ['created_at'], name: 'cards_created_at_index', using: :btree
+  add_index 'cards', ['key'], name: 'cards_key_index', unique: true, using: :btree
+  add_index 'cards', ['left_id'], name: 'cards_left_id_index', using: :btree
+  add_index 'cards', ['name'], name: 'cards_name_index', using: :btree
+  add_index 'cards', ['read_rule_id'], name: 'cards_read_rule_id_index', using: :btree
+  add_index 'cards', ['right_id'], name: 'cards_right_id_index', using: :btree
+  add_index 'cards', ['type_id'], name: 'cards_type_id_index', using: :btree
+  add_index 'cards', ['updated_at'], name: 'cards_updated_at_index', using: :btree
+
+  create_table 'schema_migrations_core_cards', id: false, force: :cascade do |t|
+    t.string 'version', limit: 255, null: false
   end
 
-  add_index "schema_migrations_core_cards", ["version"], name: "unique_schema_migrations_cards", unique: true, using: :btree
+  add_index 'schema_migrations_core_cards', ['version'], name: 'unique_schema_migrations_cards', unique: true, using: :btree
 
-  create_table "schema_migrations_deck_cards", id: false, force: :cascade do |t|
-    t.string "version", limit: 255, null: false
+  create_table 'schema_migrations_deck_cards', id: false, force: :cascade do |t|
+    t.string 'version', limit: 255, null: false
   end
 
-  add_index "schema_migrations_deck_cards", ["version"], name: "unique_schema_migrations_deck_cards", unique: true, using: :btree
+  add_index 'schema_migrations_deck_cards', ['version'], name: 'unique_schema_migrations_deck_cards', unique: true, using: :btree
 
-  create_table "sessions", force: :cascade do |t|
-    t.string   "session_id", limit: 255
-    t.text     "data",       limit: 65535
-    t.datetime "updated_at"
+  create_table 'sessions', force: :cascade do |t|
+    t.string   'session_id', limit: 255
+    t.text     'data',       limit: 65_535
+    t.datetime 'updated_at'
   end
 
-  add_index "sessions", ["session_id"], name: "sessions_session_id_index", using: :btree
-
-  create_table "users", force: :cascade do |t|
-    t.string   "login",               limit: 40
-    t.string   "email",               limit: 100
-    t.string   "crypted_password",    limit: 40
-    t.string   "salt",                limit: 42
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "password_reset_code", limit: 40
-    t.string   "status",              limit: 255, default: "request"
-    t.integer  "invite_sender_id",    limit: 4
-    t.string   "identity_url",        limit: 255
-    t.integer  "card_id",             limit: 4,                       null: false
-    t.integer  "account_id",          limit: 4,                       null: false
+  add_index 'sessions', ['session_id'], name: 'sessions_session_id_index', using: :btree
+
+  create_table 'users', force: :cascade do |t|
+    t.string   'login',               limit: 40
+    t.string   'email',               limit: 100
+    t.string   'crypted_password',    limit: 40
+    t.string   'salt',                limit: 42
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.string   'password_reset_code', limit: 40
+    t.string   'status',              limit: 255, default: 'request'
+    t.integer  'invite_sender_id',    limit: 4
+    t.string   'identity_url',        limit: 255
+    t.integer  'card_id',             limit: 4,                       null: false
+    t.integer  'account_id',          limit: 4,                       null: false
   end
-
 end

data/db/seed/new/card_actions.yml

@@ -3128,22 +3128,6 @@ card_actions_391:
   draft: false
   comment: 
 card_actions_392:
-  id: 6873
-  card_id: 1015
-  card_act_id: 1
-  super_action_id: 
-  action_type: 0
-  draft: false
-  comment: 
-card_actions_393:
-  id: 6875
-  card_id: 1017
-  card_act_id: 1
-  super_action_id: 
-  action_type: 0
-  draft: false
-  comment: 
-card_actions_394:
   id: 6891
   card_id: 68
   card_act_id: 1
@@ -3151,7 +3135,7 @@ card_actions_394:
   action_type: 1
   draft: false
   comment: 
-card_actions_395:
+card_actions_393:
   id: 6896
   card_id: 1033
   card_act_id: 1
@@ -3159,7 +3143,7 @@ card_actions_395:
   action_type: 0
   draft: false
   comment: 
-card_actions_396:
+card_actions_394:
   id: 6897
   card_id: 1034
   card_act_id: 1
@@ -3167,7 +3151,7 @@ card_actions_396:
   action_type: 0
   draft: false
   comment: 
-card_actions_397:
+card_actions_395:
   id: 6898
   card_id: 1035
   card_act_id: 1
@@ -3175,7 +3159,7 @@ card_actions_397:
   action_type: 0
   draft: false
   comment: 
-card_actions_398:
+card_actions_396:
   id: 6899
   card_id: 1036
   card_act_id: 1
@@ -3183,7 +3167,7 @@ card_actions_398:
   action_type: 0
   draft: false
   comment: 
-card_actions_399:
+card_actions_397:
   id: 6900
   card_id: 1037
   card_act_id: 1
@@ -3191,7 +3175,7 @@ card_actions_399:
   action_type: 0
   draft: false
   comment: 
-card_actions_400:
+card_actions_398:
   id: 6901
   card_id: 1038
   card_act_id: 1
@@ -3199,7 +3183,7 @@ card_actions_400:
   action_type: 0
   draft: false
   comment: 
-card_actions_401:
+card_actions_399:
   id: 6902
   card_id: 1039
   card_act_id: 1
@@ -3207,7 +3191,7 @@ card_actions_401:
   action_type: 0
   draft: false
   comment: 
-card_actions_402:
+card_actions_400:
   id: 6903
   card_id: 1040
   card_act_id: 1
@@ -3215,7 +3199,7 @@ card_actions_402:
   action_type: 0
   draft: false
   comment: 
-card_actions_403:
+card_actions_401:
   id: 6904
   card_id: 1041
   card_act_id: 1
@@ -3223,7 +3207,7 @@ card_actions_403:
   action_type: 0
   draft: false
   comment: 
-card_actions_404:
+card_actions_402:
   id: 6905
   card_id: 1042
   card_act_id: 1
@@ -3231,7 +3215,7 @@ card_actions_404:
   action_type: 0
   draft: false
   comment: 
-card_actions_405:
+card_actions_403:
   id: 6906
   card_id: 1043
   card_act_id: 1
@@ -3239,7 +3223,7 @@ card_actions_405:
   action_type: 0
   draft: false
   comment: 
-card_actions_406:
+card_actions_404:
   id: 6907
   card_id: 1044
   card_act_id: 1
@@ -3247,7 +3231,7 @@ card_actions_406:
   action_type: 0
   draft: false
   comment: 
-card_actions_407:
+card_actions_405:
   id: 6908
   card_id: 1045
   card_act_id: 1
@@ -3255,7 +3239,7 @@ card_actions_407:
   action_type: 0
   draft: false
   comment: 
-card_actions_408:
+card_actions_406:
   id: 6909
   card_id: 1046
   card_act_id: 1
@@ -3263,7 +3247,7 @@ card_actions_408:
   action_type: 0
   draft: false
   comment: 
-card_actions_409:
+card_actions_407:
   id: 6910
   card_id: 1047
   card_act_id: 1
@@ -3271,7 +3255,7 @@ card_actions_409:
   action_type: 0
   draft: false
   comment: 
-card_actions_410:
+card_actions_408:
   id: 6911
   card_id: 1048
   card_act_id: 1
@@ -3279,7 +3263,7 @@ card_actions_410:
   action_type: 0
   draft: false
   comment: 
-card_actions_411:
+card_actions_409:
   id: 6912
   card_id: 1049
   card_act_id: 1
@@ -3287,7 +3271,7 @@ card_actions_411:
   action_type: 0
   draft: false
   comment: 
-card_actions_412:
+card_actions_410:
   id: 6913
   card_id: 1050
   card_act_id: 1
@@ -3295,7 +3279,7 @@ card_actions_412:
   action_type: 0
   draft: false
   comment: 
-card_actions_413:
+card_actions_411:
   id: 6914
   card_id: 1051
   card_act_id: 1
@@ -3303,7 +3287,7 @@ card_actions_413:
   action_type: 0
   draft: false
   comment: 
-card_actions_414:
+card_actions_412:
   id: 6915
   card_id: 1052
   card_act_id: 1
@@ -3311,7 +3295,7 @@ card_actions_414:
   action_type: 0
   draft: false
   comment: 
-card_actions_415:
+card_actions_413:
   id: 6916
   card_id: 1053
   card_act_id: 1
@@ -3319,7 +3303,7 @@ card_actions_415:
   action_type: 0
   draft: false
   comment: 
-card_actions_416:
+card_actions_414:
   id: 6917
   card_id: 1054
   card_act_id: 1
@@ -3327,7 +3311,7 @@ card_actions_416:
   action_type: 0
   draft: false
   comment: 
-card_actions_417:
+card_actions_415:
   id: 6918
   card_id: 1055
   card_act_id: 1
@@ -3335,7 +3319,7 @@ card_actions_417:
   action_type: 0
   draft: false
   comment: 
-card_actions_418:
+card_actions_416:
   id: 6919
   card_id: 1056
   card_act_id: 1
@@ -3343,7 +3327,7 @@ card_actions_418:
   action_type: 0
   draft: false
   comment: 
-card_actions_419:
+card_actions_417:
   id: 6920
   card_id: 1057
   card_act_id: 1
@@ -3351,7 +3335,7 @@ card_actions_419:
   action_type: 0
   draft: false
   comment: 
-card_actions_420:
+card_actions_418:
   id: 6921
   card_id: 1058
   card_act_id: 1
@@ -3359,7 +3343,7 @@ card_actions_420:
   action_type: 0
   draft: false
   comment: 
-card_actions_421:
+card_actions_419:
   id: 6922
   card_id: 1059
   card_act_id: 1
@@ -3367,7 +3351,7 @@ card_actions_421:
   action_type: 0
   draft: false
   comment: 
-card_actions_422:
+card_actions_420:
   id: 6924
   card_id: 1061
   card_act_id: 1
@@ -3375,7 +3359,7 @@ card_actions_422:
   action_type: 0
   draft: false
   comment: 
-card_actions_423:
+card_actions_421:
   id: 6925
   card_id: 1062
   card_act_id: 1
@@ -3383,7 +3367,15 @@ card_actions_423:
   action_type: 0
   draft: false
   comment: 
-card_actions_424:
+card_actions_422:
+  id: 6976
+  card_id: 69
+  card_act_id: 1
+  super_action_id: 
+  action_type: 1
+  draft: false
+  comment: 
+card_actions_423:
   id: 7122
   card_id: 1008
   card_act_id: 1
@@ -3391,7 +3383,7 @@ card_actions_424:
   action_type: 1
   draft: false
   comment: 
-card_actions_425:
+card_actions_424:
   id: 7149
   card_id: 1199
   card_act_id: 1
@@ -3399,7 +3391,7 @@ card_actions_425:
   action_type: 0
   draft: false
   comment: 
-card_actions_426:
+card_actions_425:
   id: 7150
   card_id: 1201
   card_act_id: 1
@@ -3407,7 +3399,7 @@ card_actions_426:
   action_type: 0
   draft: false
   comment: 
-card_actions_427:
+card_actions_426:
   id: 7151
   card_id: 1200
   card_act_id: 1
@@ -3415,7 +3407,7 @@ card_actions_427:
   action_type: 0
   draft: false
   comment: 
-card_actions_428:
+card_actions_427:
   id: 7152
   card_id: 1202
   card_act_id: 1
@@ -3423,7 +3415,7 @@ card_actions_428:
   action_type: 0
   draft: false
   comment: 
-card_actions_429:
+card_actions_428:
   id: 7153
   card_id: 1203
   card_act_id: 1
@@ -3431,7 +3423,7 @@ card_actions_429:
   action_type: 0
   draft: false
   comment: 
-card_actions_430:
+card_actions_429:
   id: 7154
   card_id: 1205
   card_act_id: 1
@@ -3439,7 +3431,7 @@ card_actions_430:
   action_type: 0
   draft: false
   comment: 
-card_actions_431:
+card_actions_430:
   id: 7155
   card_id: 1204
   card_act_id: 1
@@ -3447,7 +3439,7 @@ card_actions_431:
   action_type: 0
   draft: false
   comment: 
-card_actions_432:
+card_actions_431:
   id: 7156
   card_id: 1206
   card_act_id: 1
@@ -3455,7 +3447,7 @@ card_actions_432:
   action_type: 0
   draft: false
   comment: 
-card_actions_433:
+card_actions_432:
   id: 7157
   card_id: 1207
   card_act_id: 1
@@ -3463,7 +3455,7 @@ card_actions_433:
   action_type: 0
   draft: false
   comment: 
-card_actions_434:
+card_actions_433:
   id: 7158
   card_id: 1209
   card_act_id: 1
@@ -3471,7 +3463,7 @@ card_actions_434:
   action_type: 0
   draft: false
   comment: 
-card_actions_435:
+card_actions_434:
   id: 7159
   card_id: 1208
   card_act_id: 1
@@ -3479,7 +3471,7 @@ card_actions_435:
   action_type: 0
   draft: false
   comment: 
-card_actions_436:
+card_actions_435:
   id: 7160
   card_id: 1210
   card_act_id: 1
@@ -3487,7 +3479,7 @@ card_actions_436:
   action_type: 0
   draft: false
   comment: 
-card_actions_437:
+card_actions_436:
   id: 7161
   card_id: 375
   card_act_id: 1
@@ -3495,7 +3487,7 @@ card_actions_437:
   action_type: 1
   draft: false
   comment: 
-card_actions_438:
+card_actions_437:
   id: 7162
   card_id: 1211
   card_act_id: 1
@@ -3503,7 +3495,7 @@ card_actions_438:
   action_type: 0
   draft: false
   comment: 
-card_actions_439:
+card_actions_438:
   id: 7163
   card_id: 377
   card_act_id: 1
@@ -3511,7 +3503,7 @@ card_actions_439:
   action_type: 1
   draft: false
   comment: 
-card_actions_440:
+card_actions_439:
   id: 7164
   card_id: 1212
   card_act_id: 1
@@ -3519,7 +3511,7 @@ card_actions_440:
   action_type: 0
   draft: false
   comment: 
-card_actions_441:
+card_actions_440:
   id: 7165
   card_id: 380
   card_act_id: 1
@@ -3527,7 +3519,7 @@ card_actions_441:
   action_type: 1
   draft: false
   comment: 
-card_actions_442:
+card_actions_441:
   id: 7166
   card_id: 1213
   card_act_id: 1
@@ -3535,7 +3527,7 @@ card_actions_442:
   action_type: 0
   draft: false
   comment: 
-card_actions_443:
+card_actions_442:
   id: 7167
   card_id: 383
   card_act_id: 1
@@ -3543,7 +3535,7 @@ card_actions_443:
   action_type: 1
   draft: false
   comment: 
-card_actions_444:
+card_actions_443:
   id: 7168
   card_id: 1214
   card_act_id: 1
@@ -3551,7 +3543,7 @@ card_actions_444:
   action_type: 0
   draft: false
   comment: 
-card_actions_445:
+card_actions_444:
   id: 7169
   card_id: 1215
   card_act_id: 1
@@ -3559,7 +3551,7 @@ card_actions_445:
   action_type: 0
   draft: false
   comment: 
-card_actions_446:
+card_actions_445:
   id: 7171
   card_id: 1216
   card_act_id: 1
@@ -3567,7 +3559,7 @@ card_actions_446:
   action_type: 0
   draft: false
   comment: 
-card_actions_447:
+card_actions_446:
   id: 7172
   card_id: 1218
   card_act_id: 1
@@ -3575,7 +3567,7 @@ card_actions_447:
   action_type: 0
   draft: false
   comment: 
-card_actions_448:
+card_actions_447:
   id: 7173
   card_id: 1219
   card_act_id: 1
@@ -3583,7 +3575,7 @@ card_actions_448:
   action_type: 0
   draft: false
   comment: 
-card_actions_449:
+card_actions_448:
   id: 7174
   card_id: 1221
   card_act_id: 1
@@ -3591,7 +3583,7 @@ card_actions_449:
   action_type: 0
   draft: false
   comment: 
-card_actions_450:
+card_actions_449:
   id: 7175
   card_id: 1220
   card_act_id: 1
@@ -3599,7 +3591,7 @@ card_actions_450:
   action_type: 0
   draft: false
   comment: 
-card_actions_451:
+card_actions_450:
   id: 7176
   card_id: 1222
   card_act_id: 1
@@ -3607,7 +3599,7 @@ card_actions_451:
   action_type: 0
   draft: false
   comment: 
-card_actions_452:
+card_actions_451:
   id: 7177
   card_id: 1223
   card_act_id: 1
@@ -3615,7 +3607,7 @@ card_actions_452:
   action_type: 0
   draft: false
   comment: 
-card_actions_453:
+card_actions_452:
   id: 7178
   card_id: 1224
   card_act_id: 1
@@ -3623,7 +3615,7 @@ card_actions_453:
   action_type: 0
   draft: false
   comment: 
-card_actions_454:
+card_actions_453:
   id: 7179
   card_id: 1225
   card_act_id: 1
@@ -3631,7 +3623,7 @@ card_actions_454:
   action_type: 0
   draft: false
   comment: 
-card_actions_455:
+card_actions_454:
   id: 7180
   card_id: 1226
   card_act_id: 1
@@ -3639,7 +3631,7 @@ card_actions_455:
   action_type: 0
   draft: false
   comment: 
-card_actions_456:
+card_actions_455:
   id: 7181
   card_id: 1227
   card_act_id: 1
@@ -3647,7 +3639,7 @@ card_actions_456:
   action_type: 0
   draft: false
   comment: 
-card_actions_457:
+card_actions_456:
   id: 7182
   card_id: 1228
   card_act_id: 1
@@ -3655,7 +3647,7 @@ card_actions_457:
   action_type: 0
   draft: false
   comment: 
-card_actions_458:
+card_actions_457:
   id: 7183
   card_id: 1229
   card_act_id: 1
@@ -3663,7 +3655,7 @@ card_actions_458:
   action_type: 0
   draft: false
   comment: 
-card_actions_459:
+card_actions_458:
   id: 7184
   card_id: 1230
   card_act_id: 1
@@ -3671,7 +3663,7 @@ card_actions_459:
   action_type: 0
   draft: false
   comment: 
-card_actions_460:
+card_actions_459:
   id: 7185
   card_id: 1231
   card_act_id: 1
@@ -3679,7 +3671,7 @@ card_actions_460:
   action_type: 0
   draft: false
   comment: 
-card_actions_461:
+card_actions_460:
   id: 7186
   card_id: 1232
   card_act_id: 1
@@ -3687,7 +3679,7 @@ card_actions_461:
   action_type: 0
   draft: false
   comment: 
-card_actions_462:
+card_actions_461:
   id: 7187
   card_id: 1233
   card_act_id: 1
@@ -3695,7 +3687,7 @@ card_actions_462:
   action_type: 0
   draft: false
   comment: 
-card_actions_463:
+card_actions_462:
   id: 7188
   card_id: 1234
   card_act_id: 1
@@ -3703,7 +3695,7 @@ card_actions_463:
   action_type: 0
   draft: false
   comment: 
-card_actions_464:
+card_actions_463:
   id: 7190
   card_id: 1236
   card_act_id: 1
@@ -3711,7 +3703,7 @@ card_actions_464:
   action_type: 0
   draft: false
   comment: 
-card_actions_465:
+card_actions_464:
   id: 7191
   card_id: 1237
   card_act_id: 1
@@ -3719,7 +3711,7 @@ card_actions_465:
   action_type: 0
   draft: false
   comment: 
-card_actions_466:
+card_actions_465:
   id: 7192
   card_id: 1238
   card_act_id: 1
@@ -3727,7 +3719,7 @@ card_actions_466:
   action_type: 0
   draft: false
   comment: 
-card_actions_467:
+card_actions_466:
   id: 7195
   card_id: 1239
   card_act_id: 1
@@ -3735,7 +3727,7 @@ card_actions_467:
   action_type: 0
   draft: false
   comment: 
-card_actions_468:
+card_actions_467:
   id: 7196
   card_id: 1240
   card_act_id: 1
@@ -3743,7 +3735,7 @@ card_actions_468:
   action_type: 0
   draft: false
   comment: 
-card_actions_469:
+card_actions_468:
   id: 7197
   card_id: 1241
   card_act_id: 1
@@ -3751,7 +3743,7 @@ card_actions_469:
   action_type: 0
   draft: false
   comment: 
-card_actions_470:
+card_actions_469:
   id: 7204
   card_id: 1242
   card_act_id: 1
@@ -3759,7 +3751,7 @@ card_actions_470:
   action_type: 0
   draft: false
   comment: 
-card_actions_471:
+card_actions_470:
   id: 7205
   card_id: 1244
   card_act_id: 1
@@ -3767,7 +3759,7 @@ card_actions_471:
   action_type: 0
   draft: false
   comment: 
-card_actions_472:
+card_actions_471:
   id: 7206
   card_id: 1243
   card_act_id: 1
@@ -3775,7 +3767,7 @@ card_actions_472:
   action_type: 0
   draft: false
   comment: 
-card_actions_473:
+card_actions_472:
   id: 7207
   card_id: 1245
   card_act_id: 1
@@ -3783,7 +3775,7 @@ card_actions_473:
   action_type: 0
   draft: false
   comment: 
-card_actions_474:
+card_actions_473:
   id: 7208
   card_id: 1246
   card_act_id: 1
@@ -3791,7 +3783,7 @@ card_actions_474:
   action_type: 0
   draft: false
   comment: 
-card_actions_475:
+card_actions_474:
   id: 7238
   card_id: 1247
   card_act_id: 1
@@ -3799,7 +3791,7 @@ card_actions_475:
   action_type: 1
   draft: false
   comment: 
-card_actions_476:
+card_actions_475:
   id: 7239
   card_id: 212
   card_act_id: 1
@@ -3807,7 +3799,7 @@ card_actions_476:
   action_type: 1
   draft: false
   comment: 
-card_actions_477:
+card_actions_476:
   id: 7271
   card_id: 1217
   card_act_id: 1
@@ -3815,7 +3807,7 @@ card_actions_477:
   action_type: 1
   draft: false
   comment: 
-card_actions_478:
+card_actions_477:
   id: 7274
   card_id: 216
   card_act_id: 1
@@ -3823,7 +3815,7 @@ card_actions_478:
   action_type: 1
   draft: false
   comment: 
-card_actions_479:
+card_actions_478:
   id: 7276
   card_id: 181
   card_act_id: 1
@@ -3831,6 +3823,14 @@ card_actions_479:
   action_type: 1
   draft: false
   comment: 
+card_actions_479:
+  id: 7279
+  card_id: 100
+  card_act_id: 1
+  super_action_id: 
+  action_type: 1
+  draft: false
+  comment: 
 card_actions_480:
   id: 7283
   card_id: 1248
@@ -4584,6 +4584,14 @@ card_actions_573:
   draft: false
   comment: 
 card_actions_574:
+  id: 7628
+  card_id: 73
+  card_act_id: 1
+  super_action_id: 
+  action_type: 1
+  draft: false
+  comment: 
+card_actions_575:
   id: 7629
   card_id: 453
   card_act_id: 1
@@ -4591,7 +4599,7 @@ card_actions_574:
   action_type: 1
   draft: false
   comment: 
-card_actions_575:
+card_actions_576:
   id: 7630
   card_id: 88
   card_act_id: 1
@@ -4599,7 +4607,7 @@ card_actions_575:
   action_type: 1
   draft: false
   comment: 
-card_actions_576:
+card_actions_577:
   id: 7665
   card_id: 103
   card_act_id: 1
@@ -4607,568 +4615,560 @@ card_actions_576:
   action_type: 1
   draft: false
   comment: favicon-194x194.png
-card_actions_577:
-  id: 7669
+card_actions_578:
+  id: 7697
   card_id: 1347
   card_act_id: 1
   super_action_id: 
   action_type: 1
   draft: false
   comment: 
-card_actions_578:
-  id: 7697
+card_actions_579:
+  id: 7723
   card_id: 1432
   card_act_id: 1
   super_action_id: 
   action_type: 0
   draft: false
   comment: 
-card_actions_579:
-  id: 7700
+card_actions_580:
+  id: 7726
   card_id: 1436
   card_act_id: 1
   super_action_id: 
   action_type: 0
   draft: false
   comment: 
-card_actions_580:
-  id: 7701
+card_actions_581:
+  id: 7727
   card_id: 1435
   card_act_id: 1
-  super_action_id: 7700
+  super_action_id: 7726
   action_type: 0
   draft: false
   comment: 
-card_actions_581:
-  id: 7702
+card_actions_582:
+  id: 7728
   card_id: 1434
   card_act_id: 1
-  super_action_id: 7701
+  super_action_id: 7727
   action_type: 0
   draft: false
   comment: 
-card_actions_582:
-  id: 7705
+card_actions_583:
+  id: 7731
   card_id: 1279
   card_act_id: 1
   super_action_id: 
   action_type: 1
   draft: false
   comment: 
-card_actions_583:
-  id: 7706
-  card_id: 1439
-  card_act_id: 1
-  super_action_id: 7705
-  action_type: 0
-  draft: false
-  comment: 
 card_actions_584:
-  id: 7707
-  card_id: 1438
+  id: 7732
+  card_id: 1439
   card_act_id: 1
-  super_action_id: 7706
+  super_action_id: 7731
   action_type: 0
   draft: false
   comment: 
 card_actions_585:
-  id: 7712
-  card_id: 1351
+  id: 7733
+  card_id: 1442
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7731
+  action_type: 0
   draft: false
   comment: 
 card_actions_586:
-  id: 7713
-  card_id: 1441
+  id: 7734
+  card_id: 1438
   card_act_id: 1
-  super_action_id: 7712
+  super_action_id: 7732
   action_type: 0
   draft: false
   comment: 
 card_actions_587:
-  id: 7716
-  card_id: 1444
+  id: 7736
+  card_id: 1441
   card_act_id: 1
-  super_action_id: 7712
+  super_action_id: 7733
   action_type: 0
   draft: false
   comment: 
 card_actions_588:
-  id: 7717
-  card_id: 1443
+  id: 7740
+  card_id: 1351
   card_act_id: 1
-  super_action_id: 7716
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_589:
-  id: 7721
-  card_id: 1355
+  id: 7741
+  card_id: 1444
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7740
+  action_type: 0
   draft: false
   comment: 
 card_actions_590:
-  id: 7722
+  id: 7742
   card_id: 1446
   card_act_id: 1
-  super_action_id: 7721
+  super_action_id: 7740
   action_type: 0
   draft: false
   comment: 
 card_actions_591:
-  id: 7725
-  card_id: 1448
+  id: 7746
+  card_id: 1355
   card_act_id: 1
-  super_action_id: 7721
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_592:
-  id: 7729
-  card_id: 1359
+  id: 7747
+  card_id: 1448
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7746
+  action_type: 0
   draft: false
   comment: 
 card_actions_593:
-  id: 7730
+  id: 7748
   card_id: 1450
   card_act_id: 1
-  super_action_id: 7729
+  super_action_id: 7746
   action_type: 0
   draft: false
   comment: 
 card_actions_594:
-  id: 7733
-  card_id: 1452
+  id: 7752
+  card_id: 1359
   card_act_id: 1
-  super_action_id: 7729
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_595:
-  id: 7737
-  card_id: 1363
+  id: 7753
+  card_id: 1452
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7752
+  action_type: 0
   draft: false
   comment: 
 card_actions_596:
-  id: 7738
+  id: 7754
   card_id: 1454
   card_act_id: 1
-  super_action_id: 7737
+  super_action_id: 7752
   action_type: 0
   draft: false
   comment: 
 card_actions_597:
-  id: 7741
-  card_id: 1456
+  id: 7758
+  card_id: 1363
   card_act_id: 1
-  super_action_id: 7737
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_598:
-  id: 7745
-  card_id: 1367
+  id: 7759
+  card_id: 1456
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7758
+  action_type: 0
   draft: false
   comment: 
 card_actions_599:
-  id: 7746
+  id: 7760
   card_id: 1458
   card_act_id: 1
-  super_action_id: 7745
+  super_action_id: 7758
   action_type: 0
   draft: false
   comment: 
 card_actions_600:
-  id: 7749
-  card_id: 1460
+  id: 7764
+  card_id: 1367
   card_act_id: 1
-  super_action_id: 7745
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_601:
-  id: 7753
-  card_id: 1371
+  id: 7765
+  card_id: 1460
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7764
+  action_type: 0
   draft: false
   comment: 
 card_actions_602:
-  id: 7754
+  id: 7766
   card_id: 1462
   card_act_id: 1
-  super_action_id: 7753
+  super_action_id: 7764
   action_type: 0
   draft: false
   comment: 
 card_actions_603:
-  id: 7757
-  card_id: 1464
+  id: 7770
+  card_id: 1371
   card_act_id: 1
-  super_action_id: 7753
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_604:
-  id: 7761
-  card_id: 1375
+  id: 7771
+  card_id: 1464
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7770
+  action_type: 0
   draft: false
   comment: 
 card_actions_605:
-  id: 7762
+  id: 7772
   card_id: 1466
   card_act_id: 1
-  super_action_id: 7761
+  super_action_id: 7770
   action_type: 0
   draft: false
   comment: 
 card_actions_606:
-  id: 7765
-  card_id: 1468
+  id: 7776
+  card_id: 1375
   card_act_id: 1
-  super_action_id: 7761
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_607:
-  id: 7769
-  card_id: 1379
+  id: 7777
+  card_id: 1468
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7776
+  action_type: 0
   draft: false
   comment: 
 card_actions_608:
-  id: 7770
+  id: 7778
   card_id: 1470
   card_act_id: 1
-  super_action_id: 7769
+  super_action_id: 7776
   action_type: 0
   draft: false
   comment: 
 card_actions_609:
-  id: 7773
-  card_id: 1472
+  id: 7782
+  card_id: 1379
   card_act_id: 1
-  super_action_id: 7769
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_610:
-  id: 7777
-  card_id: 1383
+  id: 7783
+  card_id: 1472
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7782
+  action_type: 0
   draft: false
   comment: 
 card_actions_611:
-  id: 7778
+  id: 7784
   card_id: 1474
   card_act_id: 1
-  super_action_id: 7777
+  super_action_id: 7782
   action_type: 0
   draft: false
   comment: 
 card_actions_612:
-  id: 7781
-  card_id: 1476
+  id: 7788
+  card_id: 1383
   card_act_id: 1
-  super_action_id: 7777
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_613:
-  id: 7785
-  card_id: 1387
+  id: 7789
+  card_id: 1476
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7788
+  action_type: 0
   draft: false
   comment: 
 card_actions_614:
-  id: 7786
+  id: 7790
   card_id: 1478
   card_act_id: 1
-  super_action_id: 7785
+  super_action_id: 7788
   action_type: 0
   draft: false
   comment: 
 card_actions_615:
-  id: 7789
-  card_id: 1480
+  id: 7794
+  card_id: 1387
   card_act_id: 1
-  super_action_id: 7785
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_616:
-  id: 7793
-  card_id: 1391
+  id: 7795
+  card_id: 1480
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7794
+  action_type: 0
   draft: false
   comment: 
 card_actions_617:
-  id: 7794
+  id: 7796
   card_id: 1482
   card_act_id: 1
-  super_action_id: 7793
+  super_action_id: 7794
   action_type: 0
   draft: false
   comment: 
 card_actions_618:
-  id: 7797
-  card_id: 1484
+  id: 7800
+  card_id: 1391
   card_act_id: 1
-  super_action_id: 7793
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_619:
   id: 7801
-  card_id: 1395
+  card_id: 1484
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7800
+  action_type: 0
   draft: false
   comment: 
 card_actions_620:
   id: 7802
   card_id: 1486
   card_act_id: 1
-  super_action_id: 7801
+  super_action_id: 7800
   action_type: 0
   draft: false
   comment: 
 card_actions_621:
-  id: 7805
-  card_id: 1488
+  id: 7806
+  card_id: 1395
   card_act_id: 1
-  super_action_id: 7801
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_622:
-  id: 7809
-  card_id: 1399
+  id: 7807
+  card_id: 1488
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7806
+  action_type: 0
   draft: false
   comment: 
 card_actions_623:
-  id: 7810
+  id: 7808
   card_id: 1490
   card_act_id: 1
-  super_action_id: 7809
+  super_action_id: 7806
   action_type: 0
   draft: false
   comment: 
 card_actions_624:
-  id: 7813
-  card_id: 1492
+  id: 7812
+  card_id: 1399
   card_act_id: 1
-  super_action_id: 7809
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_625:
-  id: 7817
-  card_id: 1403
+  id: 7813
+  card_id: 1492
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7812
+  action_type: 0
   draft: false
   comment: 
 card_actions_626:
-  id: 7818
+  id: 7814
   card_id: 1494
   card_act_id: 1
-  super_action_id: 7817
+  super_action_id: 7812
   action_type: 0
   draft: false
   comment: 
 card_actions_627:
-  id: 7821
-  card_id: 1496
+  id: 7818
+  card_id: 1403
   card_act_id: 1
-  super_action_id: 7817
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_628:
-  id: 7825
-  card_id: 1407
+  id: 7819
+  card_id: 1496
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7818
+  action_type: 0
   draft: false
   comment: 
 card_actions_629:
-  id: 7826
+  id: 7820
   card_id: 1498
   card_act_id: 1
-  super_action_id: 7825
+  super_action_id: 7818
   action_type: 0
   draft: false
   comment: 
 card_actions_630:
-  id: 7829
-  card_id: 1500
+  id: 7824
+  card_id: 1407
   card_act_id: 1
-  super_action_id: 7825
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_631:
-  id: 7833
-  card_id: 1411
+  id: 7825
+  card_id: 1500
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7824
+  action_type: 0
   draft: false
   comment: 
 card_actions_632:
-  id: 7834
+  id: 7826
   card_id: 1502
   card_act_id: 1
-  super_action_id: 7833
+  super_action_id: 7824
   action_type: 0
   draft: false
   comment: 
 card_actions_633:
-  id: 7837
-  card_id: 1504
+  id: 7830
+  card_id: 1411
   card_act_id: 1
-  super_action_id: 7833
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_634:
-  id: 7842
-  card_id: 1060
+  id: 7831
+  card_id: 1504
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7830
+  action_type: 0
   draft: false
   comment: 
 card_actions_635:
-  id: 7854
-  card_id: 69
+  id: 7832
+  card_id: 1506
   card_act_id: 1
-  super_action_id: 
-  action_type: 1
+  super_action_id: 7830
+  action_type: 0
   draft: false
   comment: 
 card_actions_636:
-  id: 7897
-  card_id: 1507
+  id: 7837
+  card_id: 1060
   card_act_id: 1
   super_action_id: 
-  action_type: 0
+  action_type: 1
   draft: false
   comment: 
 card_actions_637:
-  id: 7898
-  card_id: 1508
+  id: 7841
+  card_id: 1286
   card_act_id: 1
-  super_action_id: 7897
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_638:
-  id: 7902
-  card_id: 1303
+  id: 7878
+  card_id: 1509
   card_act_id: 1
   super_action_id: 
-  action_type: 1
+  action_type: 0
   draft: false
   comment: 
 card_actions_639:
-  id: 7910
-  card_id: 1514
+  id: 7879
+  card_id: 1510
   card_act_id: 1
-  super_action_id: 7909
+  super_action_id: 7878
   action_type: 0
   draft: false
   comment: 
 card_actions_640:
-  id: 7911
+  id: 7881
   card_id: 1515
   card_act_id: 1
-  super_action_id: 7909
+  super_action_id: 7880
   action_type: 0
   draft: false
   comment: 
 card_actions_641:
-  id: 7912
-  card_id: 1517
+  id: 7882
+  card_id: 1516
   card_act_id: 1
-  super_action_id: 7909
+  super_action_id: 7880
   action_type: 0
   draft: false
   comment: 
 card_actions_642:
-  id: 7913
-  card_id: 1519
+  id: 7883
+  card_id: 1518
   card_act_id: 1
-  super_action_id: 7909
+  super_action_id: 7880
   action_type: 0
   draft: false
   comment: 
 card_actions_643:
-  id: 7914
-  card_id: 1513
+  id: 7884
+  card_id: 1520
   card_act_id: 1
-  super_action_id: 7910
+  super_action_id: 7880
   action_type: 0
   draft: false
   comment: 
 card_actions_644:
-  id: 7915
-  card_id: 1516
+  id: 7885
+  card_id: 1514
   card_act_id: 1
-  super_action_id: 7912
+  super_action_id: 7881
   action_type: 0
   draft: false
   comment: 
 card_actions_645:
-  id: 7916
-  card_id: 1518
+  id: 7886
+  card_id: 1517
   card_act_id: 1
-  super_action_id: 7913
+  super_action_id: 7883
   action_type: 0
   draft: false
   comment: 
 card_actions_646:
-  id: 7918
-  card_id: 1523
+  id: 7887
+  card_id: 1519
   card_act_id: 1
-  super_action_id: 
+  super_action_id: 7884
   action_type: 0
   draft: false
   comment: 
 card_actions_647:
-  id: 7919
+  id: 7889
   card_id: 1524
   card_act_id: 1
   super_action_id: 
@@ -5176,7 +5176,7 @@ card_actions_647:
   draft: false
   comment: 
 card_actions_648:
-  id: 7920
+  id: 7890
   card_id: 1525
   card_act_id: 1
   super_action_id: 
@@ -5184,23 +5184,23 @@ card_actions_648:
   draft: false
   comment: 
 card_actions_649:
-  id: 7921
-  card_id: 1522
+  id: 7891
+  card_id: 1526
   card_act_id: 1
-  super_action_id: 7918
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_650:
-  id: 8023
-  card_id: 1526
+  id: 7892
+  card_id: 1523
   card_act_id: 1
-  super_action_id: 
+  super_action_id: 7889
   action_type: 0
   draft: false
   comment: 
 card_actions_651:
-  id: 8024
+  id: 7896
   card_id: 1527
   card_act_id: 1
   super_action_id: 
@@ -5208,23 +5208,23 @@ card_actions_651:
   draft: false
   comment: 
 card_actions_652:
-  id: 8036
-  card_id: 1528
+  id: 7897
+  card_id: 1529
   card_act_id: 1
   super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_653:
-  id: 8037
-  card_id: 1529
+  id: 7898
+  card_id: 1528
   card_act_id: 1
-  super_action_id: 
+  super_action_id: 7897
   action_type: 0
   draft: false
   comment: 
 card_actions_654:
-  id: 8038
+  id: 7900
   card_id: 1530
   card_act_id: 1
   super_action_id: 
@@ -5232,330 +5232,322 @@ card_actions_654:
   draft: false
   comment: 
 card_actions_655:
-  id: 8039
-  card_id: 1532
+  id: 7902
+  card_id: 1531
   card_act_id: 1
-  super_action_id: 8038
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_656:
-  id: 8040
+  id: 7904
   card_id: 1533
   card_act_id: 1
-  super_action_id: 8038
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_657:
-  id: 8041
-  card_id: 1534
+  id: 7905
+  card_id: 1532
   card_act_id: 1
-  super_action_id: 8038
+  super_action_id: 7904
   action_type: 0
   draft: false
   comment: 
 card_actions_658:
-  id: 8042
-  card_id: 1531
+  id: 7906
+  card_id: 1535
   card_act_id: 1
-  super_action_id: 8039
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_659:
-  id: 8043
-  card_id: 1535
+  id: 7907
+  card_id: 1534
   card_act_id: 1
-  super_action_id: 
+  super_action_id: 7906
   action_type: 0
   draft: false
   comment: 
 card_actions_660:
-  id: 8044
+  id: 7908
   card_id: 1537
   card_act_id: 1
-  super_action_id: 8043
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_661:
-  id: 8045
-  card_id: 1538
+  id: 7909
+  card_id: 1536
   card_act_id: 1
-  super_action_id: 8043
+  super_action_id: 7908
   action_type: 0
   draft: false
   comment: 
 card_actions_662:
-  id: 8046
-  card_id: 1539
+  id: 7910
+  card_id: 1538
   card_act_id: 1
-  super_action_id: 8043
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_663:
-  id: 8047
-  card_id: 1536
+  id: 7911
+  card_id: 1540
   card_act_id: 1
-  super_action_id: 8044
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_664:
-  id: 8048
-  card_id: 1540
+  id: 7912
+  card_id: 1539
   card_act_id: 1
-  super_action_id: 
+  super_action_id: 7911
   action_type: 0
   draft: false
   comment: 
 card_actions_665:
-  id: 8065
-  card_id: 73
+  id: 7914
+  card_id: 1541
   card_act_id: 1
   super_action_id: 
-  action_type: 1
+  action_type: 0
   draft: false
   comment: 
 card_actions_666:
-  id: 8066
-  card_id: 100
+  id: 7916
+  card_id: 1542
   card_act_id: 1
   super_action_id: 
-  action_type: 1
+  action_type: 0
   draft: false
   comment: 
 card_actions_667:
-  id: 8067
-  card_id: 1286
+  id: 7918
+  card_id: 1543
   card_act_id: 1
   super_action_id: 
-  action_type: 1
+  action_type: 0
   draft: false
   comment: 
 card_actions_668:
-  id: 8068
-  card_id: 1541
+  id: 7919
+  card_id: 1545
   card_act_id: 1
   super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_669:
-  id: 8069
-  card_id: 1543
+  id: 7920
+  card_id: 1544
   card_act_id: 1
-  super_action_id: 8068
+  super_action_id: 7919
   action_type: 0
   draft: false
   comment: 
 card_actions_670:
-  id: 8070
-  card_id: 1544
+  id: 7922
+  card_id: 1546
   card_act_id: 1
-  super_action_id: 8068
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_671:
-  id: 8071
-  card_id: 1545
+  id: 7924
+  card_id: 1547
   card_act_id: 1
-  super_action_id: 8068
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_672:
-  id: 8072
-  card_id: 1542
+  id: 7926
+  card_id: 1548
   card_act_id: 1
-  super_action_id: 8069
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_673:
-  id: 8076
-  card_id: 1547
+  id: 7927
+  card_id: 1550
   card_act_id: 1
   super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_674:
-  id: 8077
-  card_id: 1546
+  id: 7928
+  card_id: 1549
   card_act_id: 1
-  super_action_id: 8076
+  super_action_id: 7927
   action_type: 0
   draft: false
   comment: 
 card_actions_675:
-  id: 8078
-  card_id: 1549
+  id: 7930
+  card_id: 1551
   card_act_id: 1
   super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_676:
-  id: 8079
-  card_id: 1548
+  id: 7932
+  card_id: 1552
   card_act_id: 1
-  super_action_id: 8078
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_677:
-  id: 8080
-  card_id: 1551
+  id: 7934
+  card_id: 80
   card_act_id: 1
   super_action_id: 
-  action_type: 0
+  action_type: 1
   draft: false
   comment: 
 card_actions_678:
-  id: 8081
-  card_id: 1550
+  id: 7936
+  card_id: 1303
   card_act_id: 1
-  super_action_id: 8080
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_679:
-  id: 8082
-  card_id: 1552
+  id: 7939
+  card_id: 1554
   card_act_id: 1
   super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_680:
-  id: 8083
-  card_id: 1554
+  id: 7940
+  card_id: 1555
   card_act_id: 1
-  super_action_id: 8082
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_681:
-  id: 8084
-  card_id: 1555
+  id: 7941
+  card_id: 1556
   card_act_id: 1
-  super_action_id: 8082
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_682:
-  id: 8085
-  card_id: 1556
+  id: 7942
+  card_id: 1558
   card_act_id: 1
-  super_action_id: 8082
+  super_action_id: 7941
   action_type: 0
   draft: false
   comment: 
 card_actions_683:
-  id: 8086
-  card_id: 1553
+  id: 7943
+  card_id: 1559
   card_act_id: 1
-  super_action_id: 8083
+  super_action_id: 7941
   action_type: 0
   draft: false
   comment: 
 card_actions_684:
-  id: 8090
-  card_id: 1557
+  id: 7944
+  card_id: 1560
   card_act_id: 1
-  super_action_id: 
+  super_action_id: 7941
   action_type: 0
   draft: false
   comment: 
 card_actions_685:
-  id: 8091
-  card_id: 1559
+  id: 7945
+  card_id: 1557
   card_act_id: 1
-  super_action_id: 8090
+  super_action_id: 7942
   action_type: 0
   draft: false
   comment: 
 card_actions_686:
-  id: 8092
-  card_id: 1560
+  id: 7949
+  card_id: 1561
   card_act_id: 1
-  super_action_id: 8090
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_687:
-  id: 8093
-  card_id: 1561
+  id: 7950
+  card_id: 1563
   card_act_id: 1
-  super_action_id: 8090
+  super_action_id: 7949
   action_type: 0
   draft: false
   comment: 
 card_actions_688:
-  id: 8094
-  card_id: 1558
+  id: 7951
+  card_id: 1564
   card_act_id: 1
-  super_action_id: 8091
+  super_action_id: 7949
   action_type: 0
   draft: false
   comment: 
 card_actions_689:
-  id: 8098
-  card_id: 1562
+  id: 7952
+  card_id: 1565
   card_act_id: 1
-  super_action_id: 
+  super_action_id: 7949
   action_type: 0
   draft: false
   comment: 
 card_actions_690:
-  id: 8099
-  card_id: 1564
+  id: 7953
+  card_id: 1562
   card_act_id: 1
-  super_action_id: 8098
+  super_action_id: 7950
   action_type: 0
   draft: false
   comment: 
 card_actions_691:
-  id: 8100
-  card_id: 1565
+  id: 7956
+  card_id: 1513
   card_act_id: 1
-  super_action_id: 8098
-  action_type: 0
+  super_action_id: 
+  action_type: 1
   draft: false
   comment: 
 card_actions_692:
-  id: 8101
+  id: 8007
   card_id: 1566
   card_act_id: 1
-  super_action_id: 8098
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_693:
-  id: 8102
-  card_id: 1563
+  id: 8008
+  card_id: 1567
   card_act_id: 1
-  super_action_id: 8099
+  super_action_id: 
   action_type: 0
   draft: false
   comment: 
 card_actions_694:
-  id: 8105
-  card_id: 1512
-  card_act_id: 1
-  super_action_id: 
-  action_type: 1
-  draft: false
-  comment: 
-card_actions_695:
-  id: 8106
-  card_id: 80
+  id: 8011
+  card_id: 1568
   card_act_id: 1
   super_action_id: 
-  action_type: 1
+  action_type: 0
   draft: false
   comment: