spina 2.15.1 → 2.17.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (43) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/builds/spina/tailwind.css +39 -19
  3. data/app/assets/javascripts/spina/controllers/auto_file_upload_controller.js +49 -0
  4. data/app/assets/javascripts/spina/controllers/editor_insert_images_controller.js +38 -0
  5. data/app/assets/javascripts/spina/controllers/repeater_controller.js +4 -2
  6. data/app/assets/javascripts/spina/controllers/trix_controller.js +14 -2
  7. data/app/components/spina/forms/auto_file_upload_component.html.erb +6 -0
  8. data/app/components/spina/forms/auto_file_upload_component.rb +15 -0
  9. data/app/components/spina/forms/editor_insert_images_meta_component.html.erb +12 -0
  10. data/app/components/spina/forms/editor_insert_images_meta_component.rb +12 -0
  11. data/app/components/spina/forms/file_upload_component.html.erb +14 -0
  12. data/app/components/spina/forms/file_upload_component.rb +19 -0
  13. data/app/components/spina/forms/text_field_component.rb +3 -2
  14. data/app/components/spina/forms/trix_toolbar_component.html.erb +2 -2
  15. data/app/components/spina/media_picker/modal_component.html.erb +1 -11
  16. data/app/components/spina/pages/location_component.html.erb +6 -5
  17. data/app/components/spina/pages/page_select_component.rb +1 -1
  18. data/app/controllers/spina/admin/images_controller.rb +9 -2
  19. data/app/controllers/spina/admin/layout_controller.rb +6 -0
  20. data/app/controllers/spina/admin/navigation_items_controller.rb +29 -9
  21. data/app/models/spina/account.rb +9 -2
  22. data/app/models/spina/navigation_item.rb +24 -7
  23. data/app/models/spina/page.rb +1 -1
  24. data/app/models/spina/parts/image.rb +4 -1
  25. data/app/presenters/spina/menu_presenter.rb +1 -1
  26. data/app/views/layouts/spina/admin/admin.html.erb +2 -0
  27. data/app/views/spina/admin/layout/edit.html.erb +38 -29
  28. data/app/views/spina/admin/navigation_items/_form.html.erb +24 -13
  29. data/app/views/spina/admin/navigation_items/_navigation_item.html.erb +15 -2
  30. data/app/views/spina/admin/navigation_items/_page_form.html.erb +5 -0
  31. data/app/views/spina/admin/navigation_items/_url_form.html.erb +13 -0
  32. data/app/views/spina/admin/navigation_items/edit.html.erb +3 -0
  33. data/app/views/spina/admin/parts/texts/_form.html.erb +2 -2
  34. data/app/views/spina/admin/shared/_navigation.html.erb +4 -2
  35. data/config/locales/cs.yml +415 -0
  36. data/config/locales/en.yml +6 -0
  37. data/config/locales/fr.yml +2 -2
  38. data/config/locales/ru.yml +76 -16
  39. data/db/migrate/17_add_custom_urls_to_spina_navigation_items.rb +18 -0
  40. data/lib/generators/spina/install_generator.rb +3 -2
  41. data/lib/generators/spina/tailwind_config_generator.rb +7 -1
  42. data/lib/spina/version.rb +1 -1
  43. metadata +21 -7
@@ -0,0 +1,18 @@
1
+ class AddCustomUrlsToSpinaNavigationItems < ActiveRecord::Migration[7.0]
2
+ def change
3
+ add_column :spina_navigation_items, :url, :string
4
+ add_column :spina_navigation_items, :url_title, :string
5
+ add_column :spina_navigation_items, :kind, :string, default: "page", null: false
6
+
7
+ reversible do |dir|
8
+ dir.up do
9
+ change_column_null :spina_navigation_items, :page_id, true
10
+ end
11
+
12
+ dir.down do
13
+ Spina::NavigationItem.where(page_id: nil).delete_all
14
+ change_column_null :spina_navigation_items, :page_id, false
15
+ end
16
+ end
17
+ end
18
+ end
@@ -46,10 +46,11 @@ module Spina
46
46
  account = ::Spina::Account.first
47
47
  return if account.theme.present? && (silent_install? || !no?("Theme '#{account.theme}' is set. Skip? [Yn]"))
48
48
 
49
+ default_theme = account.theme || themes.first
49
50
  theme = if talkative_install?
50
- ask("What theme do you want to use?", limited_to: themes)
51
+ ask("What theme do you want to use?", limited_to: themes, default: default_theme)
51
52
  else
52
- account.theme || themes.first
53
+ default_theme
53
54
  end
54
55
 
55
56
  account.update(theme: theme)
@@ -3,7 +3,13 @@ module Spina
3
3
  source_root File.expand_path("../templates", __FILE__)
4
4
 
5
5
  def create_tailwind_config_file
6
- template "app/assets/config/spina/tailwind.config.js"
6
+ filename = "app/assets/config/spina/tailwind.config.js"
7
+ template filename
8
+ insert_into_file ".gitignore", <<~TEXT
9
+
10
+ # Ignore auto-generated Spina Tailwind CSS configuration
11
+ /#{filename}
12
+ TEXT
7
13
  end
8
14
  end
9
15
  end
data/lib/spina/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Spina
2
- VERSION = "2.15.1"
2
+ VERSION = "2.17.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spina
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.15.1
4
+ version: 2.17.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bram Jetten
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-06-28 00:00:00.000000000 Z
11
+ date: 2023-10-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -1191,11 +1191,13 @@ files:
1191
1191
  - app/assets/javascripts/spina/application.js
1192
1192
  - app/assets/javascripts/spina/controllers/application.js
1193
1193
  - app/assets/javascripts/spina/controllers/attachment_picker_controller.js
1194
+ - app/assets/javascripts/spina/controllers/auto_file_upload_controller.js
1194
1195
  - app/assets/javascripts/spina/controllers/autofocus_controller.js
1195
1196
  - app/assets/javascripts/spina/controllers/button_controller.js
1196
1197
  - app/assets/javascripts/spina/controllers/confetti_controller.js
1197
1198
  - app/assets/javascripts/spina/controllers/confirm_controller.js
1198
1199
  - app/assets/javascripts/spina/controllers/delegate_click_controller.js
1200
+ - app/assets/javascripts/spina/controllers/editor_insert_images_controller.js
1199
1201
  - app/assets/javascripts/spina/controllers/embed_controller.js
1200
1202
  - app/assets/javascripts/spina/controllers/embed_tag_controller.js
1201
1203
  - app/assets/javascripts/spina/controllers/exists_controller.js
@@ -1240,6 +1242,12 @@ files:
1240
1242
  - app/assets/stylesheets/spina/application.tailwind.css
1241
1243
  - app/assets/stylesheets/spina/fonts.css.erb
1242
1244
  - app/components/spina/application_component.rb
1245
+ - app/components/spina/forms/auto_file_upload_component.html.erb
1246
+ - app/components/spina/forms/auto_file_upload_component.rb
1247
+ - app/components/spina/forms/editor_insert_images_meta_component.html.erb
1248
+ - app/components/spina/forms/editor_insert_images_meta_component.rb
1249
+ - app/components/spina/forms/file_upload_component.html.erb
1250
+ - app/components/spina/forms/file_upload_component.rb
1243
1251
  - app/components/spina/forms/group_component.html.erb
1244
1252
  - app/components/spina/forms/group_component.rb
1245
1253
  - app/components/spina/forms/label_component.rb
@@ -1402,6 +1410,9 @@ files:
1402
1410
  - app/views/spina/admin/move_pages/new.html.erb
1403
1411
  - app/views/spina/admin/navigation_items/_form.html.erb
1404
1412
  - app/views/spina/admin/navigation_items/_navigation_item.html.erb
1413
+ - app/views/spina/admin/navigation_items/_page_form.html.erb
1414
+ - app/views/spina/admin/navigation_items/_url_form.html.erb
1415
+ - app/views/spina/admin/navigation_items/edit.html.erb
1405
1416
  - app/views/spina/admin/navigation_items/new.html.erb
1406
1417
  - app/views/spina/admin/navigations/_navigation.html.erb
1407
1418
  - app/views/spina/admin/navigations/edit.html.erb
@@ -1469,6 +1480,7 @@ files:
1469
1480
  - config/initializers/yaml_column_permitted_classes.rb
1470
1481
  - config/locales/TH.yml
1471
1482
  - config/locales/bg.yml
1483
+ - config/locales/cs.yml
1472
1484
  - config/locales/de.yml
1473
1485
  - config/locales/en.yml
1474
1486
  - config/locales/es.yml
@@ -1491,6 +1503,7 @@ files:
1491
1503
  - db/migrate/14_add_json_attributes_to_spina_pages.rb
1492
1504
  - db/migrate/15_add_slug_to_spina_resources.rb
1493
1505
  - db/migrate/16_add_ancestry_cache_columns_to_spina_pages.rb
1506
+ - db/migrate/17_add_custom_urls_to_spina_navigation_items.rb
1494
1507
  - db/migrate/1_create_spina_tables.rb
1495
1508
  - db/migrate/2_create_spina_translation_tables.rb
1496
1509
  - db/migrate/3_create_spina_navigations.rb
@@ -1549,9 +1562,10 @@ metadata:
1549
1562
  documentation_uri: https://www.spinacms.com/docs
1550
1563
  changelog_uri: https://github.com/SpinaCMS/Spina/blob/main/CHANGELOG.md
1551
1564
  source_code_uri: https://github.com/SpinaCMS/Spina
1552
- post_install_message: "\n Spina v2.14 includes a new migration, don't forget to
1565
+ post_install_message: "\n Spina v2.16 includes a new migration, don't forget to
1553
1566
  run spina:install:migrations.\n \n For details on this specific release, refer
1554
- to the CHANGELOG file.\n "
1567
+ to the CHANGELOG file.\n https://github.com/SpinaCMS/Spina/blob/main/CHANGELOG.md#2160-august-23rd-2022\n
1568
+ \ "
1555
1569
  rdoc_options: []
1556
1570
  require_paths:
1557
1571
  - lib
@@ -1566,8 +1580,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1566
1580
  - !ruby/object:Gem::Version
1567
1581
  version: '0'
1568
1582
  requirements: []
1569
- rubygems_version: 3.1.6
1570
- signing_key:
1583
+ rubygems_version: 3.4.18
1584
+ signing_key:
1571
1585
  specification_version: 4
1572
1586
  summary: Spina
1573
1587
  test_files: []