denny · denny · Apr 29, 2021 · Apr 28, 2021 · Apr 28, 2021 · Apr 28, 2021
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/plugins/ShinyCMS/.rubocop.yml b/plugins/ShinyCMS/.rubocop.yml
@@ -191,14 +191,6 @@ Style/IpAddresses:
 Style/RegexpLiteral:
   Enabled: false
 
-# Disabling these for now, as part of the first run at enforcing boundaries with Packwerk
-Style/StaticClass:
-  Exclude:
-    - app/public/models/shinycms/interface/*.rb
-Naming/PredicateName:
-  Exclude:
-    - app/public/models/shinycms/interface/*.rb
-
 # Whitespace Considered Helpful
 Layout/ExtraSpacing:
   Enabled: false
@@ -216,6 +208,8 @@ Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false
 Layout/SpaceInsideReferenceBrackets:
   Enabled: false
+Layout/RedundantLineBreak:
+  Enabled: false
 
 # Alignment also considered helpful. And aesthetically pleasing.
 Layout/HashAlignment:

diff --git a/plugins/ShinyCMS/app/assets/stylesheets/shinycms/main_site.scss b/plugins/ShinyCMS/app/assets/stylesheets/shinycms/main_site.scss
@@ -99,3 +99,14 @@ body {
 .clear-both {
   clear:        both;
 }
+
+.a11y-hidden {
+  border:       0;
+  clip:         rect( 0 0 0 0 );
+  height:       1px;
+  margin:       -1px;
+  overflow:     hidden;
+  padding:      0;
+  position:     absolute;
+  width:        1px;
+}
diff --git a/plugins/ShinyCMS/app/views/shinycms/admin/includes/_sidebar.html.erb b/plugins/ShinyCMS/app/views/shinycms/admin/includes/_sidebar.html.erb
@@ -8,6 +8,6 @@
 </nav>
 
 <footer class="c-sidebar-footer">
-  Powered by <a title="ShinyCMS <%= ShinyCMS::VERSION %>.<%= ShinyCMS::RELEASE %>"
+  Powered by <a title="ShinyCMS <%= ShinyCMS::VERSION %>.<%#= ShinyCMS::RELEASE %>"
                 href="https://shinycms.org/">ShinyCMS</a>
 </footer>
diff --git a/plugins/ShinyCMS/db/demo_site_data.rb b/plugins/ShinyCMS/db/demo_site_data.rb
diff --git a/plugins/ShinyCMS/lib/shinycms/version.rb b/plugins/ShinyCMS/lib/shinycms/version.rb
@@ -12,6 +12,6 @@ module ShinyCMS
   public_constant :VERSION
 
   # Use the start of the git commit SHA as a release identifier
-  RELEASE = `git show --abbrev=4 --pretty=%h -q`.chomp
-  public_constant :RELEASE
+  # RELEASE = `git show --abbrev=4 --pretty=%h -q`.chomp
+  # public_constant :RELEASE
 end
diff --git a/plugins/ShinyCMS/lib/tasks/support/demo_site_task.rb b/plugins/ShinyCMS/lib/tasks/support/demo_site_task.rb
@@ -31,6 +31,7 @@ def other_models
         ActsAsTaggableOn::Tagging,
 
         ActiveStorage::Blob,
+        ActiveStorage::VariantRecord,
         ActiveStorage::Attachment
       ]
     end

diff --git a/plugins/ShinyLists/app/views/shiny_lists/includes/_subscription_form.html.erb b/plugins/ShinyLists/app/views/shiny_lists/includes/_subscription_form.html.erb
@@ -6,9 +6,9 @@
 <%= form_for :subscription, url: shiny_lists.list_subscribe_path( list.slug ), method: :post, class: 'subscription_form' do |f| %>
   <% unless user_signed_in? %>
   <% if show_name_field %>
-  <%= f.text_field :name, placeholder: t( 'shiny_lists.name' ) %><br>
+  <%= f.label :name, class: 'a11y-hidden' %><%= f.text_field :name, placeholder: t( 'shiny_lists.name' ) %><br>
   <% end %>
-  <%= f.text_field :email, placeholder: t( 'shiny_lists.email_address' ) %>
+  <%= f.label :email, class: 'a11y-hidden' %><%= f.text_field :email, placeholder: t( 'shiny_lists.email_address' ) %>
   <% if show_name_field %><br><% end %>
   <% end %>
   <%= f.submit t( 'shiny_lists.subscribe' ), name: nil, class: 'button' %>

diff --git a/plugins/ShinySearch/app/views/shiny_search/search/_form.html.erb b/plugins/ShinySearch/app/views/shiny_search/search/_form.html.erb
@@ -1,5 +1,5 @@
 <% name ||= 'search_form' %>
 <%= form_with name: name, url: shiny_search.search_path, method: :get, local: true do |f| %>
-  <%= f.text_field 'query' %>&nbsp;
+  <%= f.label :query, 'Search', class: 'a11y-hidden' %><%= f.text_field :query %>&nbsp;
   <%= f.submit t( 'shiny_search.search.form.search' ), name: nil, class: 'button' %>
 <% end %>
diff --git a/public/images/pic01.jpg b/public/images/pic01.jpg
diff --git a/public/images/pic02.jpg b/public/images/pic02.jpg
diff --git a/public/images/pic03.jpg b/public/images/pic03.jpg
diff --git a/public/images/pic04.jpg b/public/images/pic04.jpg
diff --git a/themes/halcyonic/stylesheets/halcyonic/shinycms.scss b/themes/halcyonic/stylesheets/halcyonic/shinycms.scss
@@ -118,6 +118,17 @@ input.long {
   width:                30em;
 }
 
+.a11y-hidden {
+  border:       0;
+  clip:         rect( 0 0 0 0 );
+  height:       1px;
+  margin:       -1px;
+  overflow:     hidden;
+  padding:      0;
+  position:     absolute;
+  width:        1px;
+}
+
 // ===== ( undoing sweeping style resets ) =====
 
 blockquote {

diff --git a/themes/halcyonic/views/includes/_footer.html.erb b/themes/halcyonic/views/includes/_footer.html.erb
@@ -16,10 +16,10 @@
                   <h2>Log in</h2>
                   <%= form_for( :user, url: shinycms.user_session_path, method: :post ) do |f| %>
                     <div class="field">
-                      <%= f.text_field :login, autocomplete: 'email', placeholder: 'Username or email' %>
+                      <%= f.label :login, class: 'a11y-hidden' %><%= f.text_field :login, autocomplete: 'email', placeholder: 'Username or email' %>
                     </div>
                     <div class="field">
-                      <%= f.password_field :password, autocomplete: "current-password", placeholder: 'Password' %>
+                      <%= f.label :password, class: 'a11y-hidden' %><%= f.password_field :password, autocomplete: "current-password", placeholder: 'Password' %>
                     </div>
                     <div class="field">
                       <%= f.check_box :remember_me %> <%= f.label :remember_me %>

diff --git a/themes/halcyonic/views/layouts/main_site.html.erb b/themes/halcyonic/views/layouts/main_site.html.erb
@@ -6,7 +6,7 @@
   html5up.net/license
 -->
 
-<html>
+<html lang="<%= I18n.locale.to_s %>">
   <%= render partial: 'includes/head' %>
 
   <body<% unless @page&.default_page? %> class="subpage"<% end %>>

diff --git a/themes/halcyonic/views/shiny_pages/pages/index.html.erb b/themes/halcyonic/views/shiny_pages/pages/index.html.erb
@@ -8,7 +8,7 @@
                 <a href="<%= banner_button_url %>" class="button-large"><%= banner_button_text %></a>
               </div>
               <div class="col-6 col-12-medium imp-medium">
-                <%= link_to image_tag( banner_image, class: 'banner-image' ), url_for( banner_image ) if banner_image.attached? %>
+                <%= link_to image_tag( banner_image, alt: banner_img_alt, class: 'banner-image' ), url_for( banner_image ) if banner_image.attached? %>
               </div>
             </div>
           </div>
@@ -23,7 +23,7 @@
 
               <!-- Feature #1 -->
               <section>
-                <%= link_to image_tag( image1, class: 'bordered-feature-image' ), url_for( image1 ) if image1.attached? %>
+                <%= link_to image_tag( image1, alt: img1_alt, class: 'bordered-feature-image' ), url_for( image1 ) if image1.attached? %>
                 <h2>
                   <%= heading1 %>
                 </h2>
@@ -35,7 +35,7 @@
 
               <!-- Feature #2 -->
               <section>
-                <%= link_to image_tag( image2, class: 'bordered-feature-image' ), url_for( image2 ) if image2.attached? %>
+                <%= link_to image_tag( image2, alt: img2_alt, class: 'bordered-feature-image' ), url_for( image2 ) if image2.attached? %>
                 <h2>
                   <%= heading2 %>
                 </h2>
@@ -47,7 +47,7 @@
 
               <!-- Feature #3 -->
               <section>
-                <%= link_to image_tag( image3, class: 'bordered-feature-image' ), url_for( image3 ) if image3.attached? %>
+                <%= link_to image_tag( image3, alt: img3_alt, class: 'bordered-feature-image' ), url_for( image3 ) if image3.attached? %>
                 <h2>
                   <%= heading3 %>
                 </h2>
@@ -59,7 +59,7 @@
 
               <!-- Feature #4 -->
               <section>
-                <%= link_to image_tag( image4, class: 'bordered-feature-image' ), url_for( image4 ) if image4.attached? %>
+                <%= link_to image_tag( image4, alt: img4_alt, class: 'bordered-feature-image' ), url_for( image4 ) if image4.attached? %>
                 <h2>
                   <%= heading4 %>
                 </h2>
@@ -83,7 +83,7 @@
                   <h2>Who We Are</h2>
                   <h3>A subheading about who we are</h3>
                 </header>
-                <%= image_tag image5 if image5.attached? %>
+                <%= image_tag image5, alt: img5_alt if image5.attached? %>
                 <p>
                   Duis neque nisi, dapibus sed mattis quis, rutrum accumsan magna sed.
                   Suspendisse eu varius nibh. Suspendisse vitae magna eget odio amet mollis
@@ -120,17 +120,17 @@
                 </header>
                 <ul class="quote-list">
                   <li>
-                    <%= image_tag image6 if image6.attached? %>
+                    <%= image_tag image6, alt: img6_alt if image6.attached? %>
                     <p>"Neque nisidapibus mattis"</p>
                     <span>Jane Doe, CEO of UntitledCorp</span>
                   </li>
                   <li>
-                    <%= image_tag image7 if image7.attached? %>
+                    <%= image_tag image7, alt: img7_alt if image7.attached? %>
                     <p>"Lorem ipsum consequat!"</p>
                     <span>John Doe, President of FakeBiz</span>
                   </li>
                   <li>
-                    <%= image_tag image8 if image8.attached? %>
+                    <%= image_tag image8, alt: img8_alt if image8.attached? %>
                     <p>"Magna veroeros amet tempus"</p>
                     <span>Mary Smith, CFO of UntitledBiz</span>
                   </li>