Ruby3

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         database: [ mysql, postgresql ]
         extension: [ core, dragonfly, images, pages, resources ]
-        ruby: [ 2.7, 2.6 ]
+        ruby: [ 3.1]
       fail-fast: false
       max-parallel: 20
     runs-on: ubuntu-latest

.gitignore

@@ -97,3 +97,4 @@ Gemfile.lock
 
 # rspec failures
 .rspec_failures
+Refinery Review.md

Gemfile

@@ -1,20 +1,26 @@
 source 'https://rubygems.org'
 
+ruby "3.2.4"
 gemspec
 
+gem 'rails', "~>7.1"
+gem 'net-smtp', require: false
+gem 'net-imap', require: false
+gem 'net-pop', require: false
+
+
 path "./" do
   gem "refinerycms-core"
+  gem "refinerycms-dragonfly"
   gem "refinerycms-images"
   gem "refinerycms-pages"
   gem "refinerycms-resources"
 end
 
-gem 'refinerycms-i18n', github: 'refinery/refinerycms-i18n', branch: 'master'
+gem 'refinerycms-i18n', git: 'https://github.com/anitagraham/refinerycms-i18n', branch: 'ruby3'
 
 # Add support for refinerycms-acts-as-indexed
-gem 'refinerycms-acts-as-indexed', ['~> 4.0', '>= 4.0.0'],
-  git: 'https://github.com/refinery/refinerycms-acts-as-indexed',
-  branch: 'master'
+gem 'refinerycms-acts-as-indexed', '~> 4.0', '>= 4.0.0', git: 'https://github.com/refinery/refinerycms-acts-as-indexed', branch: 'master'
 
 # Add the default visual editor, for now.
 gem 'refinerycms-wymeditor', ['~> 3.0', '>= 3.0.0']
@@ -43,6 +49,8 @@ group :development, :test do
   gem 'activejob'
   gem 'bootsnap', require: false
   gem 'listen', '~> 3.0'
+  gem 'rspec-rails', '~> 6.0.0.rc1'
+  gem 'puma', require: false
 end
 
 group :test do
@@ -53,9 +61,6 @@ group :test do
   gem 'rspec-retry'
   gem 'falcon'
   gem 'falcon-capybara'
-
-  # TODO: Use beta source for Rails 6 support
-  gem 'rspec-rails', '~> 4.0.0.beta3'
 end
 
 # Load local gems according to Refinery developer preference.

core/app/assets/javascripts/refinery/admin.js.erb

@@ -636,7 +636,7 @@ var page_options = {
               if( typeof(visual_editor_init) == "function" ) {
                 visual_editor_init();
               }
-              
+
 
               // Wipe the title and increment the index counter by one.
               $('#new_page_part_index').val(parseInt($('#new_page_part_index').val(), 10) + 1);

core/app/assets/stylesheets/refinery/components/_file_type_icons.scss

@@ -0,0 +1,36 @@
+%icon-font { font-family: 'FontAwesome', Helvetica, Arial, sans-serif; }
+$adobe_red: B30C00FF;
+$ms_word_blue: #1558BB;
+$msxl_green: #0F7C42;
+$mspp_brown: #C94B26;
+/* icons */
+
+.pdf_icon {@include icon(file-pdf-o, $adobe_red);}
+
+.word_icon {@include icon(file-word-o, $ms_word_blue);}
+
+.excel_icon {@include icon(file-excel-o, $msxl_green);}
+
+.powerpoint_icon {@include icon(file-powerpoint-o, $mspp_brown);}
+
+.photo_icon {@include icon(file-photo-o);}
+
+.picture_icon {@include icon(file-picture-o);}
+
+.plain_icon {@include icon('file-text')}  // text/plain
+
+.image_icon {@include icon(file-image-o);}
+
+.zip_icon {@include icon(file-zip-o);}
+
+.archive_icon {@include icon(file-archive-o);}
+
+.sound_icon {@include icon(file-sound-o);}
+
+.audio_icon {@include icon(file-audio-o);}
+
+.movie_icon {@include icon(file-movie-o);}
+
+.video_icon {@include icon(file-video-o);}
+
+.code_icon {@include icon(file-code-o);}

core/app/assets/stylesheets/refinery/components/_icons.scss

@@ -2,62 +2,104 @@
 
 /* icons */
 
-.add_icon             {@include icon('plus-circle');}
-.back_icon            {@include icon('arrow-left');}
-.close_icon           {@include icon('times-circle')}
+.add_icon {@include icon('plus-circle');}
+
+.back_icon {@include icon('arrow-left');}
+
+.close_icon {@include icon('times-circle')}
 
 .delete_icon,
-.delete_section_icon  {@include icon('minus-circle', $icon_delete_colour);}
-
-.download_icon        {@include icon('download');}
-.edit_email_icon      {@include icon('envelope-o');}
-.edit_icon            {@include icon('edit', $icon_edit_colour);}
-.email_icon           {@include icon('envelope-o');}
-.error_icon           {@include icon('question-circle', $icon_error_colour);}
-.failure_icon         {@include icon('times');}
-.folder_icon          {@include icon('folder',$icon_folder_colour)}
-.go_icon              {@include icon('caret-square-o-right');}
-.info_icon            {@include icon('info-circle');}
-.loading_icon         {@include icon('spinner'); @extend .fa-spin}
-.page_icon            {@include icon('file-o',$icon_page_colour)}
-.preview_icon         {@include icon('eye', $icon_preview_colour)}
-.remove_icon          {@include icon('unlink', $icon_delete_colour);}
-.reorder_done_icon    {@include icon('thumbs-o-up')}
-.reorder_h_icon       {@include icon('exchange');}
-.reorder_icon         {@include icon('unsorted');}
+.delete_section_icon {@include icon('minus-circle', $icon_delete_colour);}
+
+.download_icon {@include icon('download');}
+
+.edit_email_icon {@include icon('envelope-o');}
+
+.edit_icon {@include icon('edit', $icon_edit_colour);}
+
+.edit_locale_icon {@include icon('edit', $icon_locale_colour, $size: 1.2rem)}
+
+.locale_icon {@include icon('comment', $icon_locale_colour) }
+
+.email_icon {@include icon('envelope-o');}
+
+.error_icon {@include icon('question-circle', $icon_error_colour);}
+
+.failure_icon {@include icon('times');}
+
+.folder_icon {@include icon('folder', $icon_folder_colour)}
+
+.folderopen_icon {@include icon('folder-open', $icon_folder_colour)}
+
+.go_icon {@include icon('caret-square-o-right');}
+
+.info_icon {@include icon('info-circle');}
+
+.loading_icon {@include icon('spinner'); @extend .fa-spin}
+
+.page_icon {@include icon('file-o', $icon_page_colour)}
+
+.preview_icon {@include icon('eye', $icon_preview_colour)}
+
+.remove_icon {@include icon('unlink', $icon_delete_colour);}
+
+.reorder_done_icon {@include icon('thumbs-o-up')}
+
+.reorder_h_icon {@include icon('exchange');}
+
+.reorder_icon {@include icon('unsorted');}
+
 .reorder_icon.loading {@include icon('spinner')}
-.search_icon          {@include icon('search')}
-.settings_icon        {@include icon('gear')}
-.sortdown_icon        {@include icon('sort-down')}
-.sortup_icon          {@include icon('sort-up')}
-.spam_empty_icon      {@include icon('trash-o');}
-.spam_icon            {@include icon('trash');}
-.success_icon         {@include icon('check');}
+
+.search_icon {@include icon('search')}
+
+.settings_icon {@include icon('gear')}
+
+.sortdown_icon {@include icon('sort-down')}
+
+.sortup_icon {@include icon('sort-up')}
+
+.spam_empty_icon {@include icon('trash-o');}
+
+.spam_icon {@include icon('trash');}
+
+.success_icon {@include icon('check');}
+
 .switch_view_grid_icon {@include icon('th')}
+
 .switch_view_list_icon {@include icon('list')}
-.upload_icon          {@include icon('upload');}
-.user_comment_icon    {@include icon('comment-o');}
-.warning_icon         {@include icon('warning', $icon_warning_colour)}
 
-.hidden_icon  {display:none}
+.upload_icon {@include icon('upload');}
+
+.user_comment_icon {@include icon('comment-o');}
+
+.warning_icon {@include icon('warning', $icon_warning_colour)}
+
+.hidden_icon {display: none}
+
 .unhidden_icon {display: inline-block}
 
-// stacked icon/text used for locales
-.locale_marker {
-    display: inline-block;
-    font-size: 8px;
-    margin-right: 10px;
-    position: relative;
-    top: -8px;
-    .fa-stack strong {
-      left: 7px;
-      line-height: 1em;
-      position: absolute;
-      top: 9px;
-    }
+.locale_icon {
+  position: relative;
+  // icon_base (the icon) occupies the ::before position
+  @include icon_base($locale_icon_colour, $size: 1.5rem);
+
+  &::after {
+    position: absolute;
+    left: 0.3rem;
+    font-size: 0.8rem;
+    color: $locale_text_colour;
+    font-weight: bold;
+    content: attr(id);
+    text-transform: uppercase;
+  }
 }
 
 // don't want underlines on icons
-#content a[class$='icon'] {border-bottom: none}
-#content a[class$='icon']:hover {border-bottom: none}
+#content {
+  a[class$='icon'] {
+    border-bottom: none;
 
+    &:hover {border-bottom: none}
+  }
+}

core/app/assets/stylesheets/refinery/global/_colours.scss

@@ -7,15 +7,22 @@ $icon_locale_colour:  #b7e3fc;    // pale blue
 $icon_page_colour:    #86cffa;   //
 $icon_warning_colour: #FF6600; // orange
 
-$info_icon_blue:      #316CC8;
+$info_icon_blue: #022864;
 
 $icon_preview_colour: $icon_default_colour;
 $icon_edit_colour: $icon_default_colour;
 $icon_add_colour: $icon_default_colour;
 
+$locale_icon_colour: $icon_locale_colour;    // pale blue
+$locale_text_colour: #444444AA;
+$locale_selected_background: #65c3f7;
+$locale_hover_background: #cae7fb;
+$current_active_locale:  #22A7F2;
+$locale_active_background:  #22A7F2;
+
 $action_background_colour: lighten($icon_locale_colour,10%);
-$action_border_colour: $icon_locale_colour;
+$action_border_colour: #b7e3fc;
 
-// $icon_preview_colour: #7f00ff;   // violet
-// $icon_edit_colour:    #007fff;   // azure
-// $icon_add_colour:     #7fff00;   // chartreuse
+$index_entry_hover_background: #f1f1f1;
+$index_entry_actions_background: #f1f1f1;
+$index_entry_actions_border: #788;

core/app/assets/stylesheets/refinery/mixins/_images.scss

@@ -0,0 +1,99 @@
+@mixin indexImage {
+  padding: 0;
+  margin: 0;
+  line-height: 1.2;
+  a.edit_link {
+    display: inline-block;
+    font-weight: bold;
+    height: fit-content;
+
+    &:has(img) { border-bottom: 0}
+  }
+  .alt {font-style: italic}
+  .filename {font-style: italic}
+  .title {text-transform: capitalize}
+}
+
+@mixin gridImage {
+  @include indexImage;
+
+  a:has(img) ~ * {
+    display: inline-block;
+    margin-right: 2px;
+  }
+  .actions {
+    @include imageActions {
+      justify-content: flex-start;
+    };
+    margin: 0 0.25rem;
+    border: 0.5px solid $index_entry_actions_border;
+    background-color: $index_entry_actions_background;
+    border-radius: 2px;
+  }
+}
+
+@mixin listImage {
+  @include indexImage;
+  //margin: 0 12px 12px 0;
+  padding: 0;
+  overflow: hidden;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: baseline;
+  gap: 1rem;
+  .actions {
+    @include imageActions {
+      margin-left: auto;
+      justify-content: flex-end;
+    }
+  }
+
+  &:hover {
+    background-color: $index_entry_hover_background;
+  }
+}
+
+@mixin imageIndexLayout {
+  list-style-type: none;
+  width: 100%;
+  padding: 0;
+  line-height: 1.2;
+  @content;
+}
+
+// apply to #image_grid
+@mixin imageGridLayout {
+  @include imageIndexLayout {
+    padding-inline-start: 0;
+    display: grid;
+    grid-template-columns: repeat(4, 150px);
+    grid-template-rows: auto;
+    gap: 15px;
+  }
+}
+
+// apply to #image_list
+@mixin imageListLayout {
+  @include imageIndexLayout {
+    margin: 10px 0 15px 0;
+  }
+}
+
+@mixin imageActions {
+    // unset some
+    position: relative;
+    top: unset;
+    right: unset;
+    width: auto;
+
+    display: flex;
+    flex-direction: row;
+    gap: 0.5rem;
+    line-height: 1.5;
+    a {
+      float: none;
+      margin: 0;
+    }
+    @content;
+  }