From 459fe21146b94e8bc55aa3e514d547b4fcc3e81d Mon Sep 17 00:00:00 2001
From: Kim Nguyen <design@kimisgold.com>
Date: Thu, 8 Feb 2024 15:07:08 -0500
Subject: [PATCH] Provide persistent labels for grid selects.

---
 application/view/common/block-layout.phtml    | 26 +++++++++++--------
 .../view/omeka/site-admin/page/edit.phtml     | 13 ++++++----
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/application/view/common/block-layout.phtml b/application/view/common/block-layout.phtml
index 2b7d260b7..b9056d049 100644
--- a/application/view/common/block-layout.phtml
+++ b/application/view/common/block-layout.phtml
@@ -2,7 +2,7 @@
 $translate = $this->plugin('translate');
 $escape = $this->plugin('escapeHtml');
 
-$layoutGridColumnPositionOptions = ['auto' => $translate('Auto placement')];
+$layoutGridColumnPositionOptions = ['auto' => $translate('Auto')];
 foreach (range(1, 12) as $value) {
     $layoutGridColumnPositionOptions[$value] = sprintf($translate('Position %s'), $value);
 }
@@ -26,16 +26,20 @@ if ('blockGroup' === $layout) {
         <span class="restore-value"><?php echo $translate('Block to be removed'); ?></span>
         <?php if ('blockGroup' !== $layout): ?>
         <span class="block-page-layout-grid-controls">
-            <select class="block-page-layout-grid-column-position-select" data-block-page-layout-grid-column-position="<?php echo $escape($layoutGridColumnPosition); ?>">
-                <?php foreach ($layoutGridColumnPositionOptions as $key => $value): ?>
-                <option value="<?php echo $escape($key); ?>"<?php echo ($layoutGridColumnPosition == $key) ? ' selected' : '' ?>><?php echo $escape($value); ?></option>
-                <?php endforeach; ?>
-            </select>
-            <select class="block-page-layout-grid-column-span-select" data-block-page-layout-grid-column-span="<?php echo $escape($layoutGridColumnSpan); ?>">
-                <?php foreach ($layoutGridColumnSpanOptions as $key => $value): ?>
-                <option value="<?php echo $escape($key); ?>"<?php echo ($layoutGridColumnSpan == $key) ? ' selected' : '' ?>><?php echo $escape($value); ?></option>
-                <?php endforeach; ?>
-            </select>
+            <label><?php echo $translate('Position'); ?>
+                <select class="block-page-layout-grid-column-position-select" data-block-page-layout-grid-column-position="<?php echo $escape($layoutGridColumnPosition); ?>">
+                    <?php foreach ($layoutGridColumnPositionOptions as $key => $value): ?>
+                    <option value="<?php echo $escape($key); ?>"<?php echo ($layoutGridColumnPosition == $key) ? ' selected' : '' ?>><?php echo $escape($key); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </label>
+            <label><?php echo $translate('Span'); ?> 
+                <select class="block-page-layout-grid-column-span-select" data-block-page-layout-grid-column-span="<?php echo $escape($layoutGridColumnSpan); ?>">
+                    <?php foreach ($layoutGridColumnSpanOptions as $key => $value): ?>
+                    <option value="<?php echo $escape($key); ?>"<?php echo ($layoutGridColumnSpan == $key) ? ' selected' : '' ?>><?php echo $escape($key); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </label>
         </span>
         <?php endif; ?>
         <ul class="actions center">
diff --git a/application/view/omeka/site-admin/page/edit.phtml b/application/view/omeka/site-admin/page/edit.phtml
index e7e939f35..752a778b0 100644
--- a/application/view/omeka/site-admin/page/edit.phtml
+++ b/application/view/omeka/site-admin/page/edit.phtml
@@ -57,11 +57,14 @@ $form->prepare();
                 <?php endforeach; ?>
             </select>
         </label>
-        <select name="o:layout_data[grid_columns]" id="page-layout-grid-columns-select" data-page-layout-grid-columns="<?php echo $escape($pageLayoutGridColumns); ?>">
-            <?php foreach ($pageLayoutGridColumnsOptions as $key => $value): ?>
-            <option value="<?php echo $escape($key); ?>"<?php echo ($pageLayoutGridColumns == $key) ? ' selected' : '' ?>><?php echo $escape($value); ?></option>
-            <?php endforeach; ?>
-        </select>
+        <label id="total-columns-label">
+            <?php echo $translate('Columns'); ?> 
+            <select name="o:layout_data[grid_columns]" id="page-layout-grid-columns-select" data-page-layout-grid-columns="<?php echo $escape($pageLayoutGridColumns); ?>">
+                <?php foreach ($pageLayoutGridColumnsOptions as $key => $value): ?>
+                <option value="<?php echo $escape($key); ?>"<?php echo ($pageLayoutGridColumns == $key) ? ' selected' : '' ?>><?php echo $escape($key); ?></option>
+                <?php endforeach; ?>
+            </select>
+        </label>
         <ul class="actions center">
             <li><a href="#" id="preview-page-layout" aria-label="<?php echo $escape($translate('Preview layout')); ?>" title="<?php echo $escape($translate('Preview layout')); ?>"></a></li>
             <li><a href="#" id="configure-page-layout-data" class="o-icon-settings" aria-label="<?php echo $escape($translate('Configure layout')); ?>" title="<?php echo $escape($translate('Configure layout')); ?>"></a></li>