From cbc41fc7edff15fc0e447c91cef0b23b664b34ae Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Tue, 2 Sep 2025 14:17:31 -0500
Subject: [PATCH 01/13] Conditionally set attribute role menubar when menu has
 sub sections

---
 .../dso-edit-menu/dso-edit-menu.component.html    |  2 +-
 .../dso-edit-menu/dso-edit-menu.component.ts      | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
index 547ad66f63b..9cfdaa3dbd6 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
@@ -1,4 +1,4 @@
-<div class="dso-edit-menu d-flex" role="menubar">
+<div class="dso-edit-menu d-flex" [attr.role]="(hasSubSections | async) ? 'menubar' : null">
   @for (section of (sections | async); track section) {
     <div class="ms-1">
       <ng-container
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
index 634d94353e6..4c5217fed86 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
@@ -7,6 +7,7 @@ import {
   Injector,
 } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
 import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
 
 import { MenuComponent } from '../../menu/menu.component';
@@ -34,6 +35,15 @@ export class DsoEditMenuComponent extends MenuComponent {
    */
   menuID = MenuID.DSO_EDIT;
 
+  /**
+   * Whether the DSO_EDIT menu has sub sections.
+   * 
+   * This is used to determine if the menu items will be
+   * rendered within the role="menubar".
+   * 
+   * @type {Observable<boolean>}
+   */
+  hasSubSections: Observable<boolean>;
 
   constructor(protected menuService: MenuService,
               protected injector: Injector,
@@ -44,4 +54,9 @@ export class DsoEditMenuComponent extends MenuComponent {
     super(menuService, injector, authorizationService, route, themeService);
   }
 
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.hasSubSections = this.menuService.hasSubSections(this.menuID, null);
+  }
+
 }

From a3dcd3722597487c304f291f41b6d4f94fdc30c6 Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Thu, 4 Sep 2025 14:54:51 -0500
Subject: [PATCH 02/13] Update config.tamu.yml

---
 config/config.tamu.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.tamu.yml b/config/config.tamu.yml
index 0be7102650c..f51bf5f2dad 100644
--- a/config/config.tamu.yml
+++ b/config/config.tamu.yml
@@ -1,8 +1,8 @@
 rest:
   ssl: true
-  host: api-dev.library.tamu.edu
+  host: oaktrust-dev.library.tamu.edu
   port: 443
-  nameSpace: /dspace7
+  nameSpace: /server
 
 mediaViewer:
   image: true

From b59d4f7605dedb04abad0be2ab56b47c2eb5668f Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Thu, 4 Sep 2025 15:52:23 -0500
Subject: [PATCH 03/13] Add empty aria-label to default non value option

This prevents the screen reader from reading redundant instructions already provided in the select aria-label.
---
 .../shared/starts-with/date/starts-with-date.component.html  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/starts-with/date/starts-with-date.component.html b/src/app/shared/starts-with/date/starts-with-date.component.html
index 7c80d357a8a..94d3e2f3e20 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.html
+++ b/src/app/shared/starts-with/date/starts-with-date.component.html
@@ -5,7 +5,7 @@
     </span>
     <div class="col-6 col-md-2">
       <select id="year-select" class="form-select" (change)="setStartsWithYearEvent($event)" [attr.aria-label]="'browse.startsWith.choose_year.label' |translate">
-        <option [value]="-1" [selected]="!startsWithYear">
+        <option [value]="-1" [selected]="!startsWithYear" aria-label="">
           {{ 'browse.startsWith.choose_year' | translate }}
         </option>
         @for (option of startsWithOptions; track option) {
@@ -22,7 +22,8 @@
         @for (option of monthOptions; track option) {
           <option
             [value]="option"
-            [selected]="option === startsWithMonth ? 'selected': null">
+            [selected]="option === startsWithMonth ? 'selected': null"
+            [attr.aria-label]="option === 'none' ? '' : 'browse.startsWith.months.' + option | translate">
             {{ 'browse.startsWith.months.' + option | translate }}
           </option>
         }

From e6a353f600f81528b8d257a8cd9177d8af9e6445 Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Thu, 4 Sep 2025 15:56:58 -0500
Subject: [PATCH 04/13] Add appropriate label for select inputs

It is recommended to use form label for input fields.

These are added with class `sr-only` to prevent redundant visible labels from being rendered.

Includes two new i18n keys to match the input field.
---
 .../shared/starts-with/date/starts-with-date.component.html   | 2 ++
 src/assets/i18n/en.json5                                      | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/app/shared/starts-with/date/starts-with-date.component.html b/src/app/shared/starts-with/date/starts-with-date.component.html
index 94d3e2f3e20..c51c156e897 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.html
+++ b/src/app/shared/starts-with/date/starts-with-date.component.html
@@ -4,6 +4,7 @@
       {{ 'browse.startsWith.jump' | translate }}
     </span>
     <div class="col-6 col-md-2">
+      <label class="sr-only" for="year-select">{{ 'browse.startsWith.year' | translate }}</label>
       <select id="year-select" class="form-select" (change)="setStartsWithYearEvent($event)" [attr.aria-label]="'browse.startsWith.choose_year.label' |translate">
         <option [value]="-1" [selected]="!startsWithYear" aria-label="">
           {{ 'browse.startsWith.choose_year' | translate }}
@@ -18,6 +19,7 @@
       </select>
     </div>
     <div class="col-6 col-md-2">
+      <label class="sr-only" for="month-select">{{ 'browse.startsWith.month' | translate }}</label>
       <select id="month-select" class="form-select" (change)="setStartsWithMonthEvent($event)" [attr.aria-label]="'browse.startsWith.months.none.label' |translate">
         @for (option of monthOptions; track option) {
           <option
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c2628507459..39c3259283c 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1077,6 +1077,10 @@
 
   "browse.startsWith.jump": "Filter results by year or month",
 
+  "browse.startsWith.year": "Filter results by year",
+
+  "browse.startsWith.month": "Filter results by month",
+
   "browse.startsWith.months.april": "April",
 
   "browse.startsWith.months.august": "August",

From 469604bff7f3ad069a3d1b2ed3cd98329851dc41 Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Fri, 5 Sep 2025 15:24:29 -0500
Subject: [PATCH 05/13] Use `keydown` event to invoke `toggleExpanded` before
 `cdkTreeNodeToggle` setting its element to `tabindex` 0

---
 .../community-list/community-list.component.html              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/themes/tamu/app/community-list-page/community-list/community-list.component.html b/src/themes/tamu/app/community-list-page/community-list/community-list.component.html
index 21dc6c10f54..49a9789438e 100644
--- a/src/themes/tamu/app/community-list-page/community-list/community-list.component.html
+++ b/src/themes/tamu/app/community-list-page/community-list/community-list.component.html
@@ -55,8 +55,8 @@
         <button #toggle type="button" class="btn btn-default btn-transparent" cdkTreeNodeToggle
           [attr.aria-label]="(node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) }"
           (click)="toggleExpanded(node)"
-          (keyup.enter)="toggleExpanded(node)"
-          (keyup.space)="toggleExpanded(node)"
+          (keydown.enter)="toggleExpanded(node)"
+          (keydown.space)="toggleExpanded(node)"
           data-test="expand-button"
           role="button"
           tabindex="0">

From bf8e158b18963392475fdcbb26f1c3c454649660 Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Mon, 8 Sep 2025 09:31:30 -0500
Subject: [PATCH 06/13] Customize browse by starts with component form for
 accessibility

---
 .../text/starts-with-text.component.html      | 17 ++++++++++
 .../text/starts-with-text.component.scss      |  0
 .../text/starts-with-text.component.ts        | 34 +++++++++++++++++++
 src/themes/tamu/assets/i18n/en.json5          |  7 ++++
 src/themes/tamu/eager-theme.module.ts         |  2 ++
 5 files changed, 60 insertions(+)
 create mode 100644 src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
 create mode 100644 src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.scss
 create mode 100644 src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.ts

diff --git a/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
new file mode 100644
index 00000000000..7db83d289a1
--- /dev/null
+++ b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
@@ -0,0 +1,17 @@
+<form class="w-100" [formGroup]="formData" (ngSubmit)="submitForm(formData.value)">
+  <div class="mb-3">
+    <div class="row">
+      <div class="form-group input-group col-sm-12 col-md-6 col-auto">
+        <input class="form-control" [attr.aria-label]="'browse.startsWith.input' | translate" placeholder="{{'browse.startsWith.placeholder' | translate}}" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith()" />
+        <span class="input-group-append">
+          <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
+        </span>
+      </div>
+    </div>
+    <small class="text-muted">
+      <span aria-hidden="true">{{'browse.startsWith.input' | translate}}. </span>
+      <span aria-hidden="true">{{'browse.startsWith.click_here' | translate}}</span>
+      <span><a [attr.aria-label]="'browse.startsWith.type_text' | translate" [routerLink]="['../../search']">{{'browse.startsWith.general_search' | translate}}</a>.</span>
+    </small>
+  </div>
+</form>
diff --git a/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.scss b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.scss
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.ts b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.ts
new file mode 100644
index 00000000000..96ca71cfb61
--- /dev/null
+++ b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.ts
@@ -0,0 +1,34 @@
+import { Component } from '@angular/core';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+// TAMU Customizations
+import { RouterLink } from '@angular/router';
+// END TAMU Customizations
+import { TranslateModule } from '@ngx-translate/core';
+
+import { StartsWithTextComponent as BaseComponent } from '../../../../../../app/shared/starts-with/text/starts-with-text.component';
+import { StartsWithType } from '../../../../../../app/shared/starts-with/starts-with-type';
+import { renderStartsWithFor } from '../../../../../../app/shared/starts-with/starts-with-decorator';
+
+
+@Component({
+  selector: 'ds-starts-with-text',
+  // styleUrls: ['./starts-with-text.component.scss'],
+  styleUrls: ['../../../../../../app/shared/starts-with/text/starts-with-text.component.scss'],
+  templateUrl: './starts-with-text.component.html',
+  // templateUrl: '../../../../../../app/shared/starts-with/text/starts-with-text.component.html',
+  standalone: true,
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    // TAMU Customizations
+    RouterLink,
+    // END TAMU Customizations
+    TranslateModule,
+  ],
+})
+@renderStartsWithFor(StartsWithType.text)
+export class StartsWithTextComponent extends BaseComponent {
+}
diff --git a/src/themes/tamu/assets/i18n/en.json5 b/src/themes/tamu/assets/i18n/en.json5
index 2b654467f67..cc8af9165e9 100644
--- a/src/themes/tamu/assets/i18n/en.json5
+++ b/src/themes/tamu/assets/i18n/en.json5
@@ -78,4 +78,11 @@
   "nav.mydspace": "My OAKTrust",
 
   "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to OAKTrust.",
+
+  "browse.startsWith.input": "To browse a location in the index, enter the first few letters",
+  "browse.startsWith.click_here": "Click here for a ",
+  "browse.startsWith.general_search": "general search",
+  "browse.startsWith.type_text": "Click here for a general search",
+
+  "browse.startsWith.placeholder": "Enter the first few letters",
 }
diff --git a/src/themes/tamu/eager-theme.module.ts b/src/themes/tamu/eager-theme.module.ts
index afc092e2363..ba207d75c99 100644
--- a/src/themes/tamu/eager-theme.module.ts
+++ b/src/themes/tamu/eager-theme.module.ts
@@ -13,6 +13,7 @@ import { LogoutPageComponent } from './app/logout-page/logout-page.component';
 import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
 import { CommunityPageSubCollectionListComponent } from './app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
 import { CommunityPageSubCommunityListComponent } from './app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component';
+import { StartsWithTextComponent } from './app/shared/starts-with/text/starts-with-text.component';
 import { SubmissionSectionLicenseComponent } from './app/submission/sections/license/section-license.component';
 // END TAMU Customizations
 
@@ -34,6 +35,7 @@ const DECLARATIONS = [
   CommunityPageSubCommunityListComponent,
   LoginPageComponent,
   LogoutPageComponent,
+  StartsWithTextComponent,
   SubmissionSectionLicenseComponent,
   // END TAMU Customizations
 ];

From 81d63762545d1d7111fe94b2fc2064604aab8f94 Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Sat, 13 Sep 2025 19:52:12 -0500
Subject: [PATCH 07/13] Add tamu theme search and search results component

---
 .../search-page/search-page.component.html    |  7 ++
 .../app/search-page/search-page.component.ts  | 26 +++++++
 .../search-results.component.html             | 67 +++++++++++++++++++
 .../search-results.component.ts               | 39 +++++++++++
 src/themes/tamu/assets/i18n/en.json5          |  4 ++
 src/themes/tamu/eager-theme.module.ts         |  8 ++-
 6 files changed, 149 insertions(+), 2 deletions(-)
 create mode 100644 src/themes/tamu/app/search-page/search-page.component.html
 create mode 100644 src/themes/tamu/app/search-page/search-page.component.ts
 create mode 100644 src/themes/tamu/app/shared/search/search-results/search-results.component.html
 create mode 100644 src/themes/tamu/app/shared/search/search-results/search-results.component.ts

diff --git a/src/themes/tamu/app/search-page/search-page.component.html b/src/themes/tamu/app/search-page/search-page.component.html
new file mode 100644
index 00000000000..adc2c3a6849
--- /dev/null
+++ b/src/themes/tamu/app/search-page/search-page.component.html
@@ -0,0 +1,7 @@
+<!-- TAMU Customization - search page single h1 -->
+<h1 class="sr-only">{{ 'search.page.heading' | translate }}</h1>
+<!-- END TAMU Customization - search page single h1 -->
+<!-- TAMU Customization - search page complete heading structure -->
+<h2 class="sr-only">{{ 'search.page.heading' | translate }}</h2>
+<!-- END TAMU Customization - search page complete heading structure -->
+<ds-search [showCsvExport]="true" [trackStatistics]="true" />
diff --git a/src/themes/tamu/app/search-page/search-page.component.ts b/src/themes/tamu/app/search-page/search-page.component.ts
new file mode 100644
index 00000000000..277bf1da026
--- /dev/null
+++ b/src/themes/tamu/app/search-page/search-page.component.ts
@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-configuration.service';
+import { SearchPageComponent as BaseComponent } from '../../../../app/search-page/search-page.component';
+import { ThemedSearchComponent } from '../../../../app/shared/search/themed-search.component';
+
+@Component({
+  selector: 'ds-themed-search-page',
+  // styleUrls: ['./search-page.component.scss'],
+  templateUrl: './search-page.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+  standalone: true,
+  imports: [
+    TranslateModule,
+    ThemedSearchComponent,
+  ],
+})
+export class SearchPageComponent extends BaseComponent {
+}
diff --git a/src/themes/tamu/app/shared/search/search-results/search-results.component.html b/src/themes/tamu/app/shared/search/search-results/search-results.component.html
new file mode 100644
index 00000000000..82600f83977
--- /dev/null
+++ b/src/themes/tamu/app/shared/search/search-results/search-results.component.html
@@ -0,0 +1,67 @@
+@if ((activeFilters$ | async).length > 0 && (appliedFilters$ | async).length === 0) {
+  <div class="row">
+    <div class="col-12">
+      <div class="filters-badge-skeleton-container">
+        <div class="filter-badge-skeleton">
+          <ngx-skeleton-loader [count]="(activeFilters$ | async).length" />
+        </div>
+      </div>
+    </div>
+  </div>
+}
+
+<div class="d-flex justify-content-between">
+  <!-- TAMU Customization - single h1 on search page -->
+  <!--
+  @if (!disableHeader) {
+    <h1>{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
+  }
+  -->
+  <h2 [ngClass]="{ 'sr-only' : disableHeader }">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h2>
+  <!-- END TAMU Customization - single h1 on search page -->
+  @if (showCsvExport) {
+    <ds-search-export-csv [searchConfig]="searchConfig" [total]="searchResults?.payload?.totalElements"></ds-search-export-csv>
+  }
+</div>
+@if (searchResults && searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0) {
+  <div @fadeIn>
+    <ds-viewable-collection
+      [config]="searchConfig.pagination"
+      [sortConfig]="searchConfig.sort"
+      [objects]="searchResults"
+      [hideGear]="true"
+      [showRSS]="true"
+      [selectable]="selectable"
+      [selectionConfig]="selectionConfig"
+      [linkType]="linkType"
+      [context]="context"
+      [hidePaginationDetail]="hidePaginationDetail"
+      [showThumbnails]="showThumbnails"
+      (contentChange)="contentChange.emit($event)"
+      (deselectObject)="deselectObject.emit($event)"
+      (selectObject)="selectObject.emit($event)">
+    </ds-viewable-collection>
+  </div>
+}
+
+@if (isLoading()) {
+  <ds-search-results-skeleton
+    [showThumbnails]="showThumbnails"
+    [numberOfResults]="searchConfig.pagination.pageSize"
+  ></ds-search-results-skeleton>
+}
+
+@if (showError()) {
+  <ds-error
+  message="{{errorMessageLabel() | translate}}"></ds-error>
+}
+@if (searchResults?.payload?.page.length === 0 || searchResults?.statusCode === 400) {
+  <div>
+    {{ 'search.results.no-results' | translate }}
+    <a [routerLink]="['/search']"
+      [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
+      queryParamsHandling="merge" role="link" tabindex="0">
+      {{"search.results.no-results-link" | translate}}
+    </a>
+  </div>
+}
diff --git a/src/themes/tamu/app/shared/search/search-results/search-results.component.ts b/src/themes/tamu/app/shared/search/search-results/search-results.component.ts
new file mode 100644
index 00000000000..aedd1551baa
--- /dev/null
+++ b/src/themes/tamu/app/shared/search/search-results/search-results.component.ts
@@ -0,0 +1,39 @@
+import { AsyncPipe, CommonModule } from '@angular/common';
+import { Component } from '@angular/core';
+import { RouterLink } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../../../app/shared/animations/fade';
+import { ErrorComponent } from '../../../../../../app/shared/error/error.component';
+import { ObjectCollectionComponent } from '../../../../../../app/shared/object-collection/object-collection.component';
+import { SearchExportCsvComponent } from '../../../../../../app/shared/search/search-export-csv/search-export-csv.component';
+import { SearchResultsSkeletonComponent } from '../../../../../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component';
+import { SearchResultsComponent as BaseComponent } from '../../../../../../app/shared/search/search-results/search-results.component';
+
+@Component({
+  selector: 'ds-themed-search-results',
+  templateUrl: './search-results.component.html',
+  styleUrls: ['../../../../../../app/shared/search/search-results/search-results.component.scss'],
+  animations: [
+    fadeIn,
+    fadeInOut,
+  ],
+  standalone: true,
+  imports: [
+    AsyncPipe,
+    ErrorComponent,
+    NgxSkeletonLoaderModule,
+    ObjectCollectionComponent,
+    RouterLink,
+    SearchExportCsvComponent,
+    SearchResultsSkeletonComponent,
+    CommonModule,
+    TranslateModule,
+  ],
+})
+export class SearchResultsComponent extends BaseComponent {
+}
diff --git a/src/themes/tamu/assets/i18n/en.json5 b/src/themes/tamu/assets/i18n/en.json5
index 2b654467f67..430301fb2e3 100644
--- a/src/themes/tamu/assets/i18n/en.json5
+++ b/src/themes/tamu/assets/i18n/en.json5
@@ -78,4 +78,8 @@
   "nav.mydspace": "My OAKTrust",
 
   "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to OAKTrust.",
+
+  "search-page.heading": "Search OAKTrust",
+
+  "search-page.configuration.heading": "Search Configuration",
 }
diff --git a/src/themes/tamu/eager-theme.module.ts b/src/themes/tamu/eager-theme.module.ts
index afc092e2363..15c4b4b7d9b 100644
--- a/src/themes/tamu/eager-theme.module.ts
+++ b/src/themes/tamu/eager-theme.module.ts
@@ -8,11 +8,13 @@ import { HomeNewsComponent } from './app/home-page/home-news/home-news.component
 import { NavbarComponent } from './app/navbar/navbar.component';
 
 // TAMU Customizations
-import { LoginPageComponent } from './app/login-page/login-page.component';
-import { LogoutPageComponent } from './app/logout-page/logout-page.component';
 import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
 import { CommunityPageSubCollectionListComponent } from './app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
 import { CommunityPageSubCommunityListComponent } from './app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component';
+import { LoginPageComponent } from './app/login-page/login-page.component';
+import { LogoutPageComponent } from './app/logout-page/logout-page.component';
+import { SearchPageComponent } from './app/search-page/search-page.component';
+import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component';
 import { SubmissionSectionLicenseComponent } from './app/submission/sections/license/section-license.component';
 // END TAMU Customizations
 
@@ -34,6 +36,8 @@ const DECLARATIONS = [
   CommunityPageSubCommunityListComponent,
   LoginPageComponent,
   LogoutPageComponent,
+  SearchPageComponent,
+  SearchResultsComponent,
   SubmissionSectionLicenseComponent,
   // END TAMU Customizations
 ];

From 0a605aa67e233ad11952ce82e6ba608c1b3fe838 Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Mon, 15 Sep 2025 10:35:13 -0500
Subject: [PATCH 08/13] Rearrange i18n labels to prevent redundant screen
 reading

---
 .../starts-with/text/starts-with-text.component.html      | 2 +-
 src/themes/tamu/assets/i18n/en.json5                      | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
index 7db83d289a1..1aaf7f5f9df 100644
--- a/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
+++ b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
@@ -9,7 +9,7 @@
       </div>
     </div>
     <small class="text-muted">
-      <span aria-hidden="true">{{'browse.startsWith.input' | translate}}. </span>
+      <span aria-hidden="true">{{'browse.startsWith.hint' | translate}}. </span>
       <span aria-hidden="true">{{'browse.startsWith.click_here' | translate}}</span>
       <span><a [attr.aria-label]="'browse.startsWith.type_text' | translate" [routerLink]="['../../search']">{{'browse.startsWith.general_search' | translate}}</a>.</span>
     </small>
diff --git a/src/themes/tamu/assets/i18n/en.json5 b/src/themes/tamu/assets/i18n/en.json5
index 98183b5deb3..02e4e95eb88 100644
--- a/src/themes/tamu/assets/i18n/en.json5
+++ b/src/themes/tamu/assets/i18n/en.json5
@@ -82,9 +82,15 @@
   "search-page.heading": "Search OAKTrust",
 
   "search-page.configuration.heading": "Search Configuration",
-  "browse.startsWith.input": "To browse a location in the index, enter the first few letters",
+
+  "browse.startsWith.input": "To browse a location in the index",
+
+  "browse.startsWith.hint": "To browse a location in the index, enter the first few letters",
+
   "browse.startsWith.click_here": "Click here for a ",
+
   "browse.startsWith.general_search": "general search",
+
   "browse.startsWith.type_text": "Click here for a general search",
 
   "browse.startsWith.placeholder": "Enter the first few letters",

From b68ae0f1c5da9930edd97b74622d827fc832acd3 Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Mon, 15 Sep 2025 11:25:39 -0500
Subject: [PATCH 09/13] Correct search page i18n keys

---
 src/themes/tamu/app/search-page/search-page.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/themes/tamu/app/search-page/search-page.component.html b/src/themes/tamu/app/search-page/search-page.component.html
index adc2c3a6849..763549655b9 100644
--- a/src/themes/tamu/app/search-page/search-page.component.html
+++ b/src/themes/tamu/app/search-page/search-page.component.html
@@ -1,7 +1,7 @@
 <!-- TAMU Customization - search page single h1 -->
-<h1 class="sr-only">{{ 'search.page.heading' | translate }}</h1>
+<h1 class="sr-only">{{ 'search-page.heading' | translate }}</h1>
 <!-- END TAMU Customization - search page single h1 -->
 <!-- TAMU Customization - search page complete heading structure -->
-<h2 class="sr-only">{{ 'search.page.heading' | translate }}</h2>
+<h2 class="sr-only">{{ 'search-page.configuration.heading' | translate }}</h2>
 <!-- END TAMU Customization - search page complete heading structure -->
 <ds-search [showCsvExport]="true" [trackStatistics]="true" />

From 9c750681a8e96a6a0503d3f92299a232dfc564d8 Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Mon, 22 Sep 2025 15:28:44 -0500
Subject: [PATCH 10/13] Add text underline to general search link

---
 .../app/shared/starts-with/text/starts-with-text.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
index 1aaf7f5f9df..a48a2b44666 100644
--- a/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
+++ b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
@@ -11,7 +11,7 @@
     <small class="text-muted">
       <span aria-hidden="true">{{'browse.startsWith.hint' | translate}}. </span>
       <span aria-hidden="true">{{'browse.startsWith.click_here' | translate}}</span>
-      <span><a [attr.aria-label]="'browse.startsWith.type_text' | translate" [routerLink]="['../../search']">{{'browse.startsWith.general_search' | translate}}</a>.</span>
+      <span><a class="text-decoration-underline" [attr.aria-label]="'browse.startsWith.type_text' | translate" [routerLink]="['../../search']">{{'browse.startsWith.general_search' | translate}}</a>.</span>
     </small>
   </div>
 </form>

From ad2ad58ad572c13d4ad628590242f5c91091ba8d Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Tue, 23 Sep 2025 09:14:27 -0500
Subject: [PATCH 11/13] Add tamu customization comments to dso edit menu
 component

---
 .../dso-edit-menu/dso-edit-menu.component.html         |  3 +++
 .../dso-page/dso-edit-menu/dso-edit-menu.component.ts  | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
index 9cfdaa3dbd6..8d2ff84b0db 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
@@ -1,4 +1,7 @@
+<!-- TAMU Customization - aria role menubar only when menuitem are present -->
 <div class="dso-edit-menu d-flex" [attr.role]="(hasSubSections | async) ? 'menubar' : null">
+<!-- <div class="dso-edit-menu d-flex" role="menubar"> -->
+<!-- END TAMU Customization - aria role menubar only when menuitem are present -->
   @for (section of (sections | async); track section) {
     <div class="ms-1">
       <ng-container
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
index 4c5217fed86..96aaba23a85 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
@@ -7,8 +7,12 @@ import {
   Injector,
 } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+// TAMU Customization - aria role menubar only when menuitem are present
 import { Observable } from 'rxjs';
-import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
+
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+// import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
+// END TAMU Customization - aria role menubar only when menuitem are present
 
 import { MenuComponent } from '../../menu/menu.component';
 import { MenuService } from '../../menu/menu.service';
@@ -35,6 +39,7 @@ export class DsoEditMenuComponent extends MenuComponent {
    */
   menuID = MenuID.DSO_EDIT;
 
+  // TAMU Customization - aria role menubar only when menuitem are present
   /**
    * Whether the DSO_EDIT menu has sub sections.
    * 
@@ -44,6 +49,7 @@ export class DsoEditMenuComponent extends MenuComponent {
    * @type {Observable<boolean>}
    */
   hasSubSections: Observable<boolean>;
+  // END TAMU Customization - aria role menubar only when menuitem are present
 
   constructor(protected menuService: MenuService,
               protected injector: Injector,
@@ -54,9 +60,11 @@ export class DsoEditMenuComponent extends MenuComponent {
     super(menuService, injector, authorizationService, route, themeService);
   }
 
+  // TAMU Customization - aria role menubar only when menuitem are present
   ngOnInit(): void {
     super.ngOnInit();
     this.hasSubSections = this.menuService.hasSubSections(this.menuID, null);
   }
+  // END TAMU Customization - aria role menubar only when menuitem are present
 
 }

From 898307784b4bbd21bfe7e126cf8c92907da20bee Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Tue, 23 Sep 2025 09:24:43 -0500
Subject: [PATCH 12/13] Add tamu customization comments to starts with date
 component

---
 .../date/starts-with-date.component.html           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/app/shared/starts-with/date/starts-with-date.component.html b/src/app/shared/starts-with/date/starts-with-date.component.html
index c51c156e897..7a6cb67e138 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.html
+++ b/src/app/shared/starts-with/date/starts-with-date.component.html
@@ -4,9 +4,14 @@
       {{ 'browse.startsWith.jump' | translate }}
     </span>
     <div class="col-6 col-md-2">
+      <!-- TAMU Customization - starts with form accessibility updates -->
       <label class="sr-only" for="year-select">{{ 'browse.startsWith.year' | translate }}</label>
+      <!-- END TAMU Customization - starts with form accessibility updates -->
       <select id="year-select" class="form-select" (change)="setStartsWithYearEvent($event)" [attr.aria-label]="'browse.startsWith.choose_year.label' |translate">
+        <!-- TAMU Customization - starts with form accessibility updates -->
         <option [value]="-1" [selected]="!startsWithYear" aria-label="">
+        <!-- <option [value]="-1" [selected]="!startsWithYear"> -->
+        <!-- END TAMU Customization - starts with form accessibility updates -->
           {{ 'browse.startsWith.choose_year' | translate }}
         </option>
         @for (option of startsWithOptions; track option) {
@@ -19,15 +24,24 @@
       </select>
     </div>
     <div class="col-6 col-md-2">
+      <!-- TAMU Customization - starts with form accessibility updates -->
       <label class="sr-only" for="month-select">{{ 'browse.startsWith.month' | translate }}</label>
+      <!-- END TAMU Customization - starts with form accessibility updates -->
       <select id="month-select" class="form-select" (change)="setStartsWithMonthEvent($event)" [attr.aria-label]="'browse.startsWith.months.none.label' |translate">
         @for (option of monthOptions; track option) {
+          <!-- TAMU Customization - starts with form accessibility updates -->
           <option
             [value]="option"
             [selected]="option === startsWithMonth ? 'selected': null"
             [attr.aria-label]="option === 'none' ? '' : 'browse.startsWith.months.' + option | translate">
             {{ 'browse.startsWith.months.' + option | translate }}
           </option>
+          <!-- <option
+            [value]="option"
+            [selected]="option === startsWithMonth ? 'selected': null">
+            {{ 'browse.startsWith.months.' + option | translate }}
+          </option> -->
+          <!-- END TAMU Customization - starts with form accessibility updates -->
         }
       </select>
     </div>

From 00476e1bc02ecca72e6c2bcbaa1a80ed6a939625 Mon Sep 17 00:00:00 2001
From: tamu-sad-iii <wwelling@tamu.edu>
Date: Tue, 23 Sep 2025 09:29:52 -0500
Subject: [PATCH 13/13] Add tamu customization comments to `tamu` starts with
 text component

---
 .../shared/starts-with/text/starts-with-text.component.html    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
index a48a2b44666..a4db73891cd 100644
--- a/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
+++ b/src/themes/tamu/app/shared/starts-with/text/starts-with-text.component.html
@@ -8,10 +8,13 @@
         </span>
       </div>
     </div>
+    <!-- TAMU Customization - starts with input hint accessibility update -->
     <small class="text-muted">
       <span aria-hidden="true">{{'browse.startsWith.hint' | translate}}. </span>
       <span aria-hidden="true">{{'browse.startsWith.click_here' | translate}}</span>
       <span><a class="text-decoration-underline" [attr.aria-label]="'browse.startsWith.type_text' | translate" [routerLink]="['../../search']">{{'browse.startsWith.general_search' | translate}}</a>.</span>
     </small>
+    <!-- <small class="text-muted">{{'browse.startsWith.type_text' | translate}}</small> -->
+    <!-- END TAMU Customization - starts with input hint accessibility update -->
   </div>
 </form>