WIP Short tag names

gunndabad · Apr 16, 2023 · fed078b · fed078b
1 parent 0ab5378
commit fed078b
Show file tree

Hide file tree

Showing 88 changed files with 487 additions and 235 deletions.
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Accordion/AccordionWithSummarySections.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Accordion/AccordionWithSummarySections.cshtml
@@ -1,9 +1,9 @@
 @page
 
 <govuk-accordion id="accordion-with-summary-sections" heading-level="3">
-    <govuk-accordion-item expanded="true">
-        <govuk-accordion-item-heading>Understanding agile project management</govuk-accordion-item-heading>
-        <govuk-accordion-item-summary>Introductions, methods, core features.</govuk-accordion-item-summary>
+    <item expanded="true">
+        <heading>Understanding agile project management</heading>
+        <summary>Introductions, methods, core features.</summary>
         <ul class="govuk-list">
             <li>
                 <a class="govuk-link" href="#">Agile and government services: an introduction</a>
@@ -15,10 +15,10 @@
                 <a class="govuk-link" href="#">Core principles of agile</a>
             </li>
         </ul>
-    </govuk-accordion-item>
-    <govuk-accordion-item>
-        <govuk-accordion-item-heading>Working with agile methods</govuk-accordion-item-heading>
-        <govuk-accordion-item-summary>Workspaces, tools and techniques, user stories, planning.</govuk-accordion-item-summary>
+    </item>
+    <item>
+        <heading>Working with agile methods</heading>
+        <summary>Workspaces, tools and techniques, user stories, planning.</summary>
         <ul class="govuk-list">
             <li>
                 <a class="govuk-link" href="#">Creating an agile working environment</a>
@@ -42,10 +42,10 @@
                 <a class="govuk-link" href="#">Developing a roadmap</a>
             </li>
         </ul>
-    </govuk-accordion-item>
-    <govuk-accordion-item>
-        <govuk-accordion-item-heading>Governing agile services</govuk-accordion-item-heading>
-        <govuk-accordion-item-summary>Principles, measuring progress, spending money.</govuk-accordion-item-summary>
+    </item>
+    <item>
+        <heading>Governing agile services</heading>
+        <summary>Principles, measuring progress, spending money.</summary>
         <ul class="govuk-list">
             <li>
                 <a class="govuk-link" href="#">Governance principles for agile service delivery</a>
@@ -66,10 +66,10 @@
                 <a class="govuk-link" href="#">Working across organisational boundaries</a>
             </li>
         </ul>
-    </govuk-accordion-item>
-    <govuk-accordion-item>
-        <govuk-accordion-item-heading>Phases of an agile project</govuk-accordion-item-heading>
-        <govuk-accordion-item-summary>Discovery, alpha, beta, live and retirement.</govuk-accordion-item-summary>
+    </item>
+    <item>
+        <heading>Phases of an agile project</heading>
+        <summary>Discovery, alpha, beta, live and retirement.</summary>
         <ul class="govuk-list">
             <li>
                 <a class="govuk-link" href="#">How the discovery phase works</a>
@@ -87,5 +87,5 @@
                 <a class="govuk-link" href="#">Retiring your service</a>
             </li>
         </ul>
-    </govuk-accordion-item>
+    </item>
 </govuk-accordion>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Breadcrumbs/Breadcrumbs.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Breadcrumbs/Breadcrumbs.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-breadcrumbs collapse-on-mobile="true">
-    <govuk-breadcrumbs-item asp-controller="Home" asp-action="Index">Home</govuk-breadcrumbs-item>
-    <govuk-breadcrumbs-item href="#" link-target="_blank">Passports, travel and living abroad</govuk-breadcrumbs-item>
-    <govuk-breadcrumbs-item>Travel abroad</govuk-breadcrumbs-item>
+    <item asp-controller="Home" asp-action="Index">Home</item>
+    <item href="#" link-target="_blank">Passports, travel and living abroad</item>
+    <item>Travel abroad</item>
 </govuk-breadcrumbs>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/CharacterCount/CharacterCount.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/CharacterCount/CharacterCount.cshtml
@@ -1,10 +1,10 @@
 @page
 
 <govuk-character-count name="more-detail" max-length="200">
-    <govuk-character-count-label class="govuk-label--l" is-page-heading="true">
+    <label class="govuk-label--l" is-page-heading="true">
         Can you provide more detail?
-    </govuk-character-count-label>
-    <govuk-character-count-hint>
+    </label>
+    <hint>
         Do not include personal or financial information like your National Insurance number or credit card details.
-    </govuk-character-count-hint>
+    </hint>
 </govuk-character-count>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/Checkboxes.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/Checkboxes.cshtml
@@ -1,20 +1,20 @@
 @page
 
 <govuk-checkboxes name="nationality">
-    <govuk-checkboxes-fieldset>
-        <govuk-checkboxes-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <checkboxes-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             What is your nationality?
-        </govuk-checkboxes-fieldset-legend>
+        </legend>
 
-        <govuk-checkboxes-hint>
+        <hint>
             If you have dual nationality, select all options that are relevant to you.
-        </govuk-checkboxes-hint>
+        </hint>
 
-        <govuk-checkboxes-item value="british">
+        <item value="british">
             British
-            <govuk-checkboxes-item-hint>including English, Scottish, Welsh and Northern Irish</govuk-checkboxes-item-hint>
-        </govuk-checkboxes-item>
-        <govuk-checkboxes-item value="irish">Irish</govuk-checkboxes-item>
-        <govuk-checkboxes-item value="other">Citizen of another country</govuk-checkboxes-item>
-    </govuk-checkboxes-fieldset>
+            <hint>including English, Scottish, Welsh and Northern Irish</hint>
+        </item>
+        <item value="irish">Irish</item>
+        <item value="other">Citizen of another country</item>
+    </checkboxes-fieldset>
 </govuk-checkboxes>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithConditional.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithConditional.cshtml
@@ -1,40 +1,40 @@
 @page
 
 <govuk-checkboxes name="contact">
-    <govuk-checkboxes-fieldset>
-        <govuk-checkboxes-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <checkboxes-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             How would you like to be contacted?
-        </govuk-checkboxes-fieldset-legend>
+        </legend>
 
-        <govuk-checkboxes-hint>
+        <hint>
             Select all options that are relevant to you.
-        </govuk-checkboxes-hint>
+        </hint>
 
-        <govuk-checkboxes-item value="email">
+        <item value="email">
             Email
-            <govuk-checkboxes-item-conditional>
+            <conditional>
                 <govuk-input name="contact-by-email" type="email" autocomplete="email" spellcheck="false" input-class="govuk-!-width-one-third">
-                    <govuk-input-label>Email address</govuk-input-label>
+                    <label>Email address</label>
                 </govuk-input>
-            </govuk-checkboxes-item-conditional>
-        </govuk-checkboxes-item>
+            </conditional>
+        </item>
 
-        <govuk-checkboxes-item value="phone">
+        <item value="phone">
             Phone
-            <govuk-checkboxes-item-conditional>
+            <conditional>
                 <govuk-input name="contact-by-phone" type="tel" autocomplete="tel" input-class="govuk-!-width-one-third">
-                    <govuk-input-label>Phone number</govuk-input-label>
+                    <label>Phone number</label>
                 </govuk-input>
-            </govuk-checkboxes-item-conditional>
-        </govuk-checkboxes-item>
+            </conditional>
+        </item>
 
-        <govuk-checkboxes-item value="text message">
+        <item value="text message">
             Text message
-            <govuk-checkboxes-item-conditional>
+            <conditional>
                 <govuk-input name="contact-by-text" type="tel" autocomplete="tel" input-class="govuk-!-width-one-third">
-                    <govuk-input-label>Mobile phone number</govuk-input-label>
+                    <label>Mobile phone number</label>
                 </govuk-input>
-            </govuk-checkboxes-item-conditional>
-        </govuk-checkboxes-item>
-    </govuk-checkboxes-fieldset>
+            </conditional>
+        </item>
+    </checkboxes-fieldset>
 </govuk-checkboxes>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithError.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithError.cshtml
@@ -1,24 +1,24 @@
 @page
 
 <govuk-checkboxes name="nationality">
-    <govuk-checkboxes-fieldset>
-        <govuk-checkboxes-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <checkboxes-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             What is your nationality?
-        </govuk-checkboxes-fieldset-legend>
+        </legend>
 
-        <govuk-checkboxes-hint>
+        <hint>
             If you have dual nationality, select all options that are relevant to you.
-        </govuk-checkboxes-hint>
+        </hint>
 
-        <govuk-checkboxes-error-message>
+        <error-message>
             Select if you are British, Irish or a citizen of a different country
-        </govuk-checkboxes-error-message>
+        </error-message>
 
-        <govuk-checkboxes-item value="british">
+        <item value="british">
             British
             <govuk-checkboxes-item-hint>including English, Scottish, Welsh and Northern Irish</govuk-checkboxes-item-hint>
-        </govuk-checkboxes-item>
-        <govuk-checkboxes-item value="irish">Irish</govuk-checkboxes-item>
-        <govuk-checkboxes-item value="other">Citizen of another country</govuk-checkboxes-item>
-    </govuk-checkboxes-fieldset>
+        </item>
+        <item value="irish">Irish</item>
+        <item value="other">Citizen of another country</item>
+    </checkboxes-fieldset>
 </govuk-checkboxes>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithNone.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithNone.cshtml
@@ -1,19 +1,19 @@
 @page
 
 <govuk-checkboxes name="countries">
-    <govuk-checkboxes-fieldset>
-        <govuk-checkboxes-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <checkboxes-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             Will you be travelling to any of these countries?
-        </govuk-checkboxes-fieldset-legend>
+        </legend>
 
-        <govuk-checkboxes-hint>
+        <hint>
             Select all countries that apply
-        </govuk-checkboxes-hint>
+        </hint>
 
-        <govuk-checkboxes-item value="france">France</govuk-checkboxes-item>
-        <govuk-checkboxes-item value="portugal">Portugal</govuk-checkboxes-item>
-        <govuk-checkboxes-item value="spain">Spain</govuk-checkboxes-item>
-        <govuk-checkboxes-divider>or</govuk-checkboxes-divider>
-        <govuk-checkboxes-item value="none" behavior="Exclusive">No, I will not be travelling to any of these countries</govuk-checkboxes-item>
-    </govuk-checkboxes-fieldset>
+        <item value="france">France</item>
+        <item value="portugal">Portugal</item>
+        <item value="spain">Spain</item>
+        <divider>or</divider>
+        <item value="none" behavior="Exclusive">No, I will not be travelling to any of these countries</item>
+    </checkboxes-fieldset>
 </govuk-checkboxes>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithoutFieldset.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Checkboxes/CheckboxesWithoutFieldset.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-checkboxes name="t-and-c">
-    <govuk-checkboxes-item value="yes">
+    <item value="yes">
         I agree to the terms and conditions
-    </govuk-checkboxes-item>
+    </item>
 </govuk-checkboxes>
diff --git a/...GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemLabels.cshtml b/...GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemLabels.cshtml
@@ -1,13 +1,13 @@
 @page
 
 <govuk-date-input id="passport-issued" name-prefix="passport-issued">
-    <govuk-date-input-day>
-        <govuk-date-input-day-label>Dydd</govuk-date-input-day-label>
-    </govuk-date-input-day>
-    <govuk-date-input-month>
-        <govuk-date-input-month-label>Mis</govuk-date-input-month-label>
-    </govuk-date-input-month>
-    <govuk-date-input-year>
-        <govuk-date-input-year-label>Blwyddyn</govuk-date-input-year-label>
-    </govuk-date-input-year>
+    <day>
+        <label>Dydd</label>
+    </day>
+    <month>
+        <label>Mis</label>
+    </month>
+    <year>
+        <label>Blwyddyn</label>
+    </year>
 </govuk-date-input>
diff --git a/...GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemValues.cshtml b/...GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithCustomItemValues.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-date-input id="passport-issued" name-prefix="passport-issued">
-    <govuk-date-input-day value="1" />
-    <govuk-date-input-month value="4" />
-    <govuk-date-input-year value="2022" />
+    <day value="1" />
+    <month value="4" />
+    <year value="2022" />
 </govuk-date-input>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithError.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithError.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-date-input id="passport-issued" name-prefix="passport-issued">
-    <govuk-date-input-error-message>
+    <error-message>
         The date your passport was issued must be in the past
-    </govuk-date-input-error-message>
+    </error-message>
 </govuk-date-input>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithFieldset.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/DateInput/DateInputWithFieldset.cshtml
@@ -1,15 +1,15 @@
 @page
 
 <govuk-date-input id="passport-issued" name-prefix="passport-issued">
-    <govuk-date-input-fieldset>
-        <govuk-date-input-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">
+    <date-input-fieldset>
+        <legend is-page-heading="true" class="govuk-fieldset__legend--l">
             When was your passport issued?
-        </govuk-date-input-fieldset-legend>
-        <govuk-date-input-hint>
+        </legend>
+        <hint>
             For example, 27 3 2007
-        </govuk-date-input-hint>
-        <govuk-date-input-error-message>
+        </hint>
+        <error-message>
             The date your passport was issued must be in the past
-        </govuk-date-input-error-message>
-    </govuk-date-input-fieldset>
+        </error-message>
+    </date-input-fieldset>
 </govuk-date-input>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/Details.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/Details.cshtml
@@ -1,11 +1,11 @@
 @page
 
 <govuk-details>
-    <govuk-details-summary>
+    <summary>
         Help with nationality
-    </govuk-details-summary>
-    <govuk-details-text>
+    </summary>
+    <text>
         We need to know your nationality so we can work out which elections you’re entitled to vote in.
         If you cannot provide your nationality, you’ll have to send copies of identity documents through the post.
-    </govuk-details-text>
+    </text>
 </govuk-details>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/DetailsExpanded.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Details/DetailsExpanded.cshtml
@@ -1,11 +1,11 @@
 @page
 
 <govuk-details open="true">
-    <govuk-details-summary>
+    <summary>
         Help with nationality
-    </govuk-details-summary>
-    <govuk-details-text>
+    </summary>
+    <text>
         We need to know your nationality so we can work out which elections you’re entitled to vote in.
         If you cannot provide your nationality, you’ll have to send copies of identity documents through the post.
-    </govuk-details-text>
+    </text>
 </govuk-details>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummary.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummary.cshtml
@@ -1,6 +1,6 @@
 @page
 
 <govuk-error-summary>
-    <govuk-error-summary-item href="#passport-issued-day">The date your passport was issued must be in the past</govuk-error-summary-item>
-    <govuk-error-summary-item href="#postcode-input">Enter a postcode, like AA1 1AA</govuk-error-summary-item>
+    <item href="#passport-issued-day">The date your passport was issued must be in the past</item>
+    <item href="#postcode-input">Enter a postcode, like AA1 1AA</item>
 </govuk-error-summary>
diff --git a/....Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithModelStateError.cshtml b/....Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithModelStateError.cshtml
@@ -2,5 +2,5 @@
 @model ErrorSummaryWithModelStateErrorModel
 
 <govuk-error-summary>
-    <govuk-error-summary-item asp-for="FullName" />
+    <item asp-for="FullName" />
 </govuk-error-summary>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithTitle.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/ErrorSummary/ErrorSummaryWithTitle.cshtml
@@ -1,7 +1,7 @@
 @page
 
 <govuk-error-summary>
-    <govuk-error-summary-title>There is a problem</govuk-error-summary-title>
-    <govuk-error-summary-item href="#passport-issued-day">The date your passport was issued must be in the past</govuk-error-summary-item>
-    <govuk-error-summary-item href="#postcode-input">Enter a postcode, like AA1 1AA</govuk-error-summary-item>
+    <title>There is a problem</title>
+    <item href="#passport-issued-day">The date your passport was issued must be in the past</item>
+    <item href="#postcode-input">Enter a postcode, like AA1 1AA</item>
 </govuk-error-summary>
diff --git a/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Fieldset/Fieldset.cshtml b/src/GovUk.Frontend.AspNetCore.DocSamples/Pages/Fieldset/Fieldset.cshtml
@@ -1,5 +1,5 @@
 @page
 
 <govuk-fieldset>
-    <govuk-fieldset-legend is-page-heading="true" class="govuk-fieldset__legend--l">Legend as page heading</govuk-fieldset-legend>
+    <legend is-page-heading="true" class="govuk-fieldset__legend--l">Legend as page heading</legend>
 </govuk-fieldset>