card 1.96.5 → 1.96.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (162) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/db/migrate_core_cards/{20150510031118_fix_skin_images.rb → 20150510031118_fix_skin_codenames.rb} +1 -1
  4. data/db/migrate_core_cards/{20170720093738_update_layout.rb → 20181120200937_update_layout.rb} +0 -0
  5. data/db/migrate_core_cards/data/cards/Xheader +17 -16
  6. data/db/seed/new/card_actions.yml +1162 -1162
  7. data/db/seed/new/card_acts.yml +2 -2
  8. data/db/seed/new/card_references.yml +155 -148
  9. data/db/seed/new/cards.yml +1613 -1613
  10. data/db/seed/new/schema_migrations_core_cards.yml +4 -0
  11. data/db/seed/test/fixtures/card_actions.yml +2152 -2152
  12. data/db/seed/test/fixtures/card_acts.yml +447 -447
  13. data/db/seed/test/fixtures/card_changes.yml +66 -66
  14. data/db/seed/test/fixtures/card_references.yml +985 -978
  15. data/db/seed/test/fixtures/cards.yml +2617 -2617
  16. data/db/seed/test/fixtures/schema_migrations_core_cards.yml +4 -0
  17. data/db/version_core_cards.txt +1 -1
  18. data/lib/card/format.rb +1 -1
  19. data/lib/card/format/permission.rb +1 -1
  20. data/lib/card/set/event/callbacks.rb +11 -3
  21. data/mod/bootstrap/db/migrate_core_cards/20181129140917_fix_skin_images.rb +12 -0
  22. data/{db/migrate_core_cards → mod/bootstrap/db/migrate_core_cards/data}/20181108181219_migrate_classic_skins_to_bootstrap.rb +9 -1
  23. data/mod/bootstrap/db/migrate_core_cards/lib/skin.rb +1 -1
  24. data/mod/bootstrap/file/cerulean_skin_image/image-icon.png +0 -0
  25. data/mod/bootstrap/file/cerulean_skin_image/image-large.png +0 -0
  26. data/mod/bootstrap/file/cerulean_skin_image/image-medium.png +0 -0
  27. data/mod/bootstrap/file/cerulean_skin_image/image-original.png +0 -0
  28. data/mod/bootstrap/file/cerulean_skin_image/image-small.png +0 -0
  29. data/mod/bootstrap/file/cosmo_skin_image/image-icon.png +0 -0
  30. data/mod/bootstrap/file/cosmo_skin_image/image-large.png +0 -0
  31. data/mod/bootstrap/file/cosmo_skin_image/image-medium.png +0 -0
  32. data/mod/bootstrap/file/cosmo_skin_image/image-original.png +0 -0
  33. data/mod/bootstrap/file/cosmo_skin_image/image-small.png +0 -0
  34. data/mod/bootstrap/file/cyborg_skin_image/image-icon.png +0 -0
  35. data/mod/bootstrap/file/cyborg_skin_image/image-large.png +0 -0
  36. data/mod/bootstrap/file/cyborg_skin_image/image-medium.png +0 -0
  37. data/mod/bootstrap/file/cyborg_skin_image/image-original.png +0 -0
  38. data/mod/bootstrap/file/cyborg_skin_image/image-small.png +0 -0
  39. data/mod/bootstrap/file/darkly_skin_image/image-icon.png +0 -0
  40. data/mod/bootstrap/file/darkly_skin_image/image-large.png +0 -0
  41. data/mod/bootstrap/file/darkly_skin_image/image-medium.png +0 -0
  42. data/mod/bootstrap/file/darkly_skin_image/image-original.png +0 -0
  43. data/mod/bootstrap/file/darkly_skin_image/image-small.png +0 -0
  44. data/mod/bootstrap/file/flatly_skin_image/image-icon.png +0 -0
  45. data/mod/bootstrap/file/flatly_skin_image/image-large.png +0 -0
  46. data/mod/bootstrap/file/flatly_skin_image/image-medium.png +0 -0
  47. data/mod/bootstrap/file/flatly_skin_image/image-original.png +0 -0
  48. data/mod/bootstrap/file/flatly_skin_image/image-small.png +0 -0
  49. data/mod/bootstrap/file/journal_skin_image/image-icon.png +0 -0
  50. data/mod/bootstrap/file/journal_skin_image/image-large.png +0 -0
  51. data/mod/bootstrap/file/journal_skin_image/image-medium.png +0 -0
  52. data/mod/bootstrap/file/journal_skin_image/image-original.png +0 -0
  53. data/mod/bootstrap/file/journal_skin_image/image-small.png +0 -0
  54. data/mod/bootstrap/file/litera_skin_image/image-icon.png +0 -0
  55. data/mod/bootstrap/file/litera_skin_image/image-large.png +0 -0
  56. data/mod/bootstrap/file/litera_skin_image/image-medium.png +0 -0
  57. data/mod/bootstrap/file/litera_skin_image/image-original.png +0 -0
  58. data/mod/bootstrap/file/litera_skin_image/image-small.png +0 -0
  59. data/mod/bootstrap/file/lumen_skin_image/image-icon.png +0 -0
  60. data/mod/bootstrap/file/lumen_skin_image/image-large.png +0 -0
  61. data/mod/bootstrap/file/lumen_skin_image/image-medium.png +0 -0
  62. data/mod/bootstrap/file/lumen_skin_image/image-original.png +0 -0
  63. data/mod/bootstrap/file/lumen_skin_image/image-small.png +0 -0
  64. data/mod/bootstrap/file/lux_skin_image/image-icon.png +0 -0
  65. data/mod/bootstrap/file/lux_skin_image/image-large.png +0 -0
  66. data/mod/bootstrap/file/lux_skin_image/image-medium.png +0 -0
  67. data/mod/bootstrap/file/lux_skin_image/image-original.png +0 -0
  68. data/mod/bootstrap/file/lux_skin_image/image-small.png +0 -0
  69. data/mod/bootstrap/file/materia_skin_image/image-icon.png +0 -0
  70. data/mod/bootstrap/file/materia_skin_image/image-large.png +0 -0
  71. data/mod/bootstrap/file/materia_skin_image/image-medium.png +0 -0
  72. data/mod/bootstrap/file/materia_skin_image/image-original.png +0 -0
  73. data/mod/bootstrap/file/materia_skin_image/image-small.png +0 -0
  74. data/mod/bootstrap/file/minty_skin_image/image-icon.png +0 -0
  75. data/mod/bootstrap/file/minty_skin_image/image-large.png +0 -0
  76. data/mod/bootstrap/file/minty_skin_image/image-medium.png +0 -0
  77. data/mod/bootstrap/file/minty_skin_image/image-original.png +0 -0
  78. data/mod/bootstrap/file/minty_skin_image/image-small.png +0 -0
  79. data/mod/bootstrap/file/paper_skin_image/image-large.png +0 -0
  80. data/mod/bootstrap/file/paper_skin_image/image-medium.png +0 -0
  81. data/mod/bootstrap/file/paper_skin_image/image-small.png +0 -0
  82. data/mod/bootstrap/file/pulse_skin_image/image-icon.png +0 -0
  83. data/mod/bootstrap/file/pulse_skin_image/image-large.png +0 -0
  84. data/mod/bootstrap/file/pulse_skin_image/image-medium.png +0 -0
  85. data/mod/bootstrap/file/pulse_skin_image/image-original.png +0 -0
  86. data/mod/bootstrap/file/pulse_skin_image/image-small.png +0 -0
  87. data/mod/bootstrap/file/readable_skin_image/image-large.png +0 -0
  88. data/mod/bootstrap/file/readable_skin_image/image-medium.png +0 -0
  89. data/mod/bootstrap/file/readable_skin_image/image-small.png +0 -0
  90. data/mod/bootstrap/file/sandstone_skin_image/image-icon.png +0 -0
  91. data/mod/bootstrap/file/sandstone_skin_image/image-large.png +0 -0
  92. data/mod/bootstrap/file/sandstone_skin_image/image-medium.png +0 -0
  93. data/mod/bootstrap/file/sandstone_skin_image/image-original.png +0 -0
  94. data/mod/bootstrap/file/sandstone_skin_image/image-small.png +0 -0
  95. data/mod/bootstrap/file/simplex_skin_image/image-icon.png +0 -0
  96. data/mod/bootstrap/file/simplex_skin_image/image-large.png +0 -0
  97. data/mod/bootstrap/file/simplex_skin_image/image-medium.png +0 -0
  98. data/mod/bootstrap/file/simplex_skin_image/image-original.png +0 -0
  99. data/mod/bootstrap/file/simplex_skin_image/image-small.png +0 -0
  100. data/mod/bootstrap/file/sketchy_skin_image/image-icon.png +0 -0
  101. data/mod/bootstrap/file/sketchy_skin_image/image-large.png +0 -0
  102. data/mod/bootstrap/file/sketchy_skin_image/image-medium.png +0 -0
  103. data/mod/bootstrap/file/sketchy_skin_image/image-original.png +0 -0
  104. data/mod/bootstrap/file/sketchy_skin_image/image-small.png +0 -0
  105. data/mod/bootstrap/file/slate_skin_image/image-icon.png +0 -0
  106. data/mod/bootstrap/file/slate_skin_image/image-large.png +0 -0
  107. data/mod/bootstrap/file/slate_skin_image/image-medium.png +0 -0
  108. data/mod/bootstrap/file/slate_skin_image/image-original.png +0 -0
  109. data/mod/bootstrap/file/slate_skin_image/image-small.png +0 -0
  110. data/mod/bootstrap/file/solar_skin_image/image-icon.png +0 -0
  111. data/mod/bootstrap/file/solar_skin_image/image-large.png +0 -0
  112. data/mod/bootstrap/file/solar_skin_image/image-medium.png +0 -0
  113. data/mod/bootstrap/file/solar_skin_image/image-original.png +0 -0
  114. data/mod/bootstrap/file/solar_skin_image/image-small.png +0 -0
  115. data/mod/bootstrap/file/spacelab_skin_image/image-icon.png +0 -0
  116. data/mod/bootstrap/file/spacelab_skin_image/image-large.png +0 -0
  117. data/mod/bootstrap/file/spacelab_skin_image/image-medium.png +0 -0
  118. data/mod/bootstrap/file/spacelab_skin_image/image-original.png +0 -0
  119. data/mod/bootstrap/file/spacelab_skin_image/image-small.png +0 -0
  120. data/mod/bootstrap/file/superhero_skin_image/image-icon.png +0 -0
  121. data/mod/bootstrap/file/superhero_skin_image/image-large.png +0 -0
  122. data/mod/bootstrap/file/superhero_skin_image/image-medium.png +0 -0
  123. data/mod/bootstrap/file/superhero_skin_image/image-original.png +0 -0
  124. data/mod/bootstrap/file/superhero_skin_image/image-small.png +0 -0
  125. data/mod/bootstrap/file/united_skin_image/image-icon.png +0 -0
  126. data/mod/bootstrap/file/united_skin_image/image-large.png +0 -0
  127. data/mod/bootstrap/file/united_skin_image/image-medium.png +0 -0
  128. data/mod/bootstrap/file/united_skin_image/image-original.png +0 -0
  129. data/mod/bootstrap/file/united_skin_image/image-small.png +0 -0
  130. data/mod/bootstrap/file/yeti_skin_image/image-icon.png +0 -0
  131. data/mod/bootstrap/file/yeti_skin_image/image-large.png +0 -0
  132. data/mod/bootstrap/file/yeti_skin_image/image-medium.png +0 -0
  133. data/mod/bootstrap/file/yeti_skin_image/image-original.png +0 -0
  134. data/mod/bootstrap/file/yeti_skin_image/image-small.png +0 -0
  135. data/mod/carrierwave/lib/carrier_wave/cardmount.rb +8 -1
  136. data/mod/carrierwave/lib/carrier_wave/file_card_uploader.rb +7 -2
  137. data/mod/carrierwave/spec/set/type/file_spec.rb +1 -0
  138. data/mod/core/spec/format/html_format_spec.rb +1 -1
  139. data/mod/history/lib/card/act/act_renderer.rb +3 -3
  140. data/mod/history/lib/card/action.rb +18 -3
  141. data/mod/machines/public/assets/jquery-ui-smoothness/ui-icons_222222_256x240.png +0 -0
  142. data/mod/machines/public/assets/jquery-ui-smoothness/ui-icons_2e83ff_256x240.png +0 -0
  143. data/mod/machines/public/assets/jquery-ui-smoothness/ui-icons_454545_256x240.png +0 -0
  144. data/mod/machines/public/assets/jquery-ui-smoothness/ui-icons_888888_256x240.png +0 -0
  145. data/mod/machines/public/assets/jquery-ui-smoothness/ui-icons_cd0a0a_256x240.png +0 -0
  146. data/mod/standard/file/credit_image/image-icon.png +0 -0
  147. data/mod/standard/file/credit_image/image-large.png +0 -0
  148. data/mod/standard/file/credit_image/image-medium.png +0 -0
  149. data/mod/standard/file/credit_image/image-original.png +0 -0
  150. data/mod/standard/file/credit_image/image-small.png +0 -0
  151. data/mod/standard/file/favicon/image-icon.png +0 -0
  152. data/mod/standard/file/favicon/image-small.png +0 -0
  153. data/mod/standard/file/logo/image-icon.png +0 -0
  154. data/mod/standard/file/logo/image-large.png +0 -0
  155. data/mod/standard/file/logo/image-medium.png +0 -0
  156. data/mod/standard/file/logo/image-original.png +0 -0
  157. data/mod/standard/file/logo/image-small.png +0 -0
  158. data/mod/standard/set/all/rich_html/error.rb +1 -1
  159. data/mod/standard/set/all/rich_html/frame.rb +1 -1
  160. data/mod/standard/set/all/rich_html/new.rb +6 -1
  161. data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/skin.min.css.map +0 -0
  162. metadata +9 -7
@@ -107,7 +107,7 @@ format :html do
107
107
  end
108
108
 
109
109
  def standard_error_message attribute, message
110
- "<strong>#{h attribute.to_s.upcase}:</strong> #{h message}"
110
+ "<div><strong>#{h attribute.to_s.upcase}:</strong> #{h message}</div>"
111
111
  end
112
112
 
113
113
  def not_found_errors
@@ -1,5 +1,5 @@
1
1
  format :html do
2
- view :flash, cache: :never do
2
+ view :flash, cache: :never, tags: :unknown_ok do
3
3
  flash_notice = params[:flash] || Env.success.flash
4
4
  return "" unless flash_notice.present? && focal?
5
5
  Array(flash_notice).join "\n"
@@ -106,7 +106,12 @@ format :html do
106
106
 
107
107
  # path to redirect to after canceling a new form
108
108
  def cancel_button_new_args
109
- { href: (main? ? path_to_previous : path(view: :missing)) }
109
+ href = case
110
+ when main? then path_to_previous
111
+ when voo&.home_view then path(view: voo.home_view)
112
+ else path(view: :missing)
113
+ end
114
+ { href: href }
110
115
  end
111
116
 
112
117
  def standard_create_button
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: card
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.96.5
4
+ version: 1.96.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2018-11-25 00:00:00.000000000 Z
14
+ date: 2018-11-30 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: cardname
@@ -19,14 +19,14 @@ dependencies:
19
19
  requirements:
20
20
  - - '='
21
21
  - !ruby/object:Gem::Version
22
- version: 0.6.5
22
+ version: 0.6.6
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 0.6.5
29
+ version: 0.6.6
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: haml
32
32
  requirement: !ruby/object:Gem::Requirement
@@ -369,7 +369,7 @@ files:
369
369
  - db/migrate_core_cards/20150429090551_search_card_context.rb
370
370
  - db/migrate_core_cards/20150501010515_responsive_sidebar.rb
371
371
  - db/migrate_core_cards/20150508212032_menu_compatibility.rb
372
- - db/migrate_core_cards/20150510031118_fix_skin_images.rb
372
+ - db/migrate_core_cards/20150510031118_fix_skin_codenames.rb
373
373
  - db/migrate_core_cards/20150528084659_add_session_cardtype.rb
374
374
  - db/migrate_core_cards/20150601133433_add_recent_setting_session_card.rb
375
375
  - db/migrate_core_cards/20150605115802_add_performance_log_card.rb
@@ -396,12 +396,11 @@ files:
396
396
  - db/migrate_core_cards/20170515101262_add_advanced_edit_cards.rb
397
397
  - db/migrate_core_cards/20170608083819_add_full_width_layout_card.rb
398
398
  - db/migrate_core_cards/20170608200649_add_input_options_codename.rb
399
- - db/migrate_core_cards/20170720093738_update_layout.rb
400
399
  - db/migrate_core_cards/20170830210517_correct_signup_success_message.rb
401
400
  - db/migrate_core_cards/20180423120222_add_mod_styles_card.rb
402
401
  - db/migrate_core_cards/20180508210903_add_json_type.rb
403
402
  - db/migrate_core_cards/20180515175726_add_codenames.rb
404
- - db/migrate_core_cards/20181108181219_migrate_classic_skins_to_bootstrap.rb
403
+ - db/migrate_core_cards/20181120200937_update_layout.rb
405
404
  - db/migrate_core_cards/data/1.11_help_text.json
406
405
  - db/migrate_core_cards/data/1.12_stylesheets/classic_cards.scss
407
406
  - db/migrate_core_cards/data/1.12_stylesheets/common.scss
@@ -1098,6 +1097,8 @@ files:
1098
1097
  - mod/bootstrap/db/migrate_core_cards/20180509090433_bootstrap_cleanup.rb
1099
1098
  - mod/bootstrap/db/migrate_core_cards/20180516153037_add_style_select2_card.rb
1100
1099
  - mod/bootstrap/db/migrate_core_cards/20180601133753_migrate_skins.rb
1100
+ - mod/bootstrap/db/migrate_core_cards/20181129140917_fix_skin_images.rb
1101
+ - mod/bootstrap/db/migrate_core_cards/data/20181108181219_migrate_classic_skins_to_bootstrap.rb
1101
1102
  - mod/bootstrap/db/migrate_core_cards/data/custom_theme/cards.scss
1102
1103
  - mod/bootstrap/db/migrate_core_cards/data/custom_theme/colors.scss
1103
1104
  - mod/bootstrap/db/migrate_core_cards/data/custom_theme/components.scss
@@ -5198,6 +5199,7 @@ files:
5198
5199
  - mod/tinymce_editor/public/assets/tinymce/skins/lightgray/img/object.gif
5199
5200
  - mod/tinymce_editor/public/assets/tinymce/skins/lightgray/img/trans.gif
5200
5201
  - mod/tinymce_editor/public/assets/tinymce/skins/lightgray/skin.min.css
5202
+ - mod/tinymce_editor/public/assets/tinymce/skins/lightgray/skin.min.css.map
5201
5203
  - mod/tinymce_editor/public/assets/tinymce/skins/lightgray/skin.mobile.min.css
5202
5204
  - mod/tinymce_editor/public/assets/tinymce/themes/inlite/theme.min.js
5203
5205
  - mod/tinymce_editor/public/assets/tinymce/themes/mobile/theme.min.js