diff --git a/src/Views/download_lockup_files.php b/src/Views/download_lockup_files.php
index 067973710fa613226b9cec9faffa8e939108f281..4ede91cd8fed942b58ea148d168c57a72ec6b1c2 100644
--- a/src/Views/download_lockup_files.php
+++ b/src/Views/download_lockup_files.php
@@ -3,7 +3,7 @@
<h3 class="page-title">Your files for "<?php echo $context->lockup->getName(); ?>" Lockup</h3>
<div class="dcf-txt-center">
<div class="center">
- <img src="<?php echo $context->lockup->getPNGDownloadURL() ?>">
+ <img src="<?php echo $context->lockup->getPNGDownloadURL() ?>" role="presentation">
</div>
<br>
<table>
diff --git a/src/Views/lockup_library.php b/src/Views/lockup_library.php
index 9c8b8cf239e1fb643c3e544a28e65c312a36c935..fc8598cd0ef39ecd797dcbc214f4cf57cb6e718c 100644
--- a/src/Views/lockup_library.php
+++ b/src/Views/lockup_library.php
@@ -8,17 +8,19 @@
<div class="dcf-bleed dcf-pt-8 dcf-pb-8">
<div class="dcf-wrapper">
<h3 class="page-title">Lockup Library</h3>
- <form>
- <input style="width: auto;" value="<?php echo $context->search_term ?>" type="text" placeholder="Search..." name="search_term">
- <button type="submit" class="dcf-btn wdn-button-triad">Search</button>
- <?php if (!empty($context->search_term)): ?>
- <button id="clear-search" class="dcf-btn dcf-btn-primary" type="button">×</button>
- <?php endif; ?>
+ <form class="dcf-form">
+ <div class="dcf-input-group">
+ <input style="width: auto;" value="<?php echo $context->search_term ?>" type="text" placeholder="Search..." name="search_term">
+ <button type="submit" class="dcf-btn dcf-btn-secondary">Search</button>
+ <?php if (!empty($context->search_term)): ?>
+ <button id="clear-search" class="dcf-btn dcf-btn-primary" type="button">×</button>
+ <?php endif; ?>
+ </div>
</form>
<br>
<?php foreach ($context->lockups as $chunk): ?>
<h4>Lockups Approved For <?php echo $chunk[0]->approver == '' ? '(unknown)' : $chunk[0]->approver->organization ?></h4>
- <table>
+ <table class="dcf-table">
<thead>
<tr>
<th>Title</th>
@@ -29,7 +31,7 @@
<?php foreach ($chunk as $lockup): ?>
<tr>
<td><a href="<?php echo $lockup->getDownloadURL(); ?>"><?php echo $lockup->getName(); ?></a></td>
- <td><a href="<?php echo $lockup->getDownloadURL(); ?>"><?php echo $lockup->preview_svg; ?></a></td>
+ <td><a href="<?php echo $lockup->getDownloadURL(); ?>" aria-label="View lockup <?php echo $lockup->getName(); ?>"><?php echo $lockup->preview_svg; ?></a></td>
</tr>
<?php endforeach; ?>
</tbody>
diff --git a/src/Views/new_lockup.php b/src/Views/new_lockup.php
index e4cc65135461534ef588232b8e274910165504fb..243ba1cef0a6d7ef57b0364865f0af7dd3aa570c 100644
--- a/src/Views/new_lockup.php
+++ b/src/Views/new_lockup.php
@@ -2,12 +2,12 @@
<div class="dcf-wrapper">
<h3 class="page-title">Create New Lockup</h3>
- <form id="create-lockup" method="POST" action="">
+ <form class="dcf-form" id="create-lockup" method="POST" action="">
<input type="hidden" id="id" name="id" value="<?php echo $context->lockup->id; ?>">
<?php if (\Auth::$current_user === NULL): ?>
<fieldset>
<legend class="dcf-legend">Login</legend>
- <div><label class="dcf-label">We'll need you to login to your My.UNL account before creating a lockup.</label></div>
+ <div><label>We'll need you to login to your My.UNL account before creating a lockup.</label></div>
<a class="dcf-btn dcf-btn-primary" href="https://shib.unl.edu/idp/profile/cas/login?service=<?php echo "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"; ?>">Login</a>
</fieldset>
<?php endif; ?>
@@ -15,28 +15,32 @@
<fieldset class="dcf-pb-4">
<legend class="dcf-legend">Style</legend>
<div>
- <input class="dcf-input-control" type="radio" id="show-horiz" name="show" checked="checked"><label class="dcf-label" for="show-horiz">Show Horizontal</label>
- <input class="dcf-input-control" type="radio" id="show-vert" name="show"><label class="dcf-label" for="show-vert">Show Vertical</label>
+ <div class="dcf-input-radio dcf-d-inline-block">
+ <input type="radio" id="show-horiz" name="show" checked="checked"><label for="show-horiz">Show Horizontal</label>
+ </div>
+ <div class="dcf-input-radio dcf-d-inline-block">
+ <input type="radio" id="show-vert" name="show"><label for="show-vert">Show Vertical</label>
+ </div>
</div>
<br>
<div class="dcf-grid-full dcf-grid-halves@sm dcf-col-gap-vw">
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="org_only" id="type-org-only" <?php if ($context->lockup->style == 'org_only' || empty($context->lockup->style)) echo 'checked="checked"'; ?>>
- <img class="horiz height-36" src="<?php echo $context->baseURL; ?>images/org_only_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_only_vert_example.png">
+ <img class="horiz height-36" src="<?php echo $context->baseURL; ?>images/org_only_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_only_vert_example.png" role="presentation">
</label><br>
- <label for="type-org-only" class="dcf-label">
+ <label for="type-org-only">
Primary ID lockup (A): primary hierarchy for your full College, Department, Unit or Subject name in a single line design.
</label><br><br>
</div>
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="org_two_line" id="type-org-two-line" <?php if ($context->lockup->style == 'org_two_line') echo 'checked="checked"'; ?>>
- <img class="horiz height-36" src="<?php echo $context->baseURL; ?>images/org_two_line_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_two_line_vert_example.png">
+ <img class="horiz height-36" src="<?php echo $context->baseURL; ?>images/org_two_line_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_two_line_vert_example.png" role="presentation">
</label><br>
- <label for="type-org-two-line" class="dcf-label">
+ <label for="type-org-two-line">
Primary ID lockup (B): primary hierarchy for your full College, Department, Unit or Subject name in a two-line design.
<br><em>*Additional line should be used when ID is too long to fit on one line.</em>
</label><br><br>
@@ -44,22 +48,22 @@
</div>
<div class="dcf-grid-full dcf-grid-halves@sm dcf-col-gap-vw">
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="org_subject" id="type-org-subject" <?php if ($context->lockup->style == 'org_subject') echo 'checked="checked"'; ?>>
- <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/org_subject_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_subject_vert_example.png">
+ <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/org_subject_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_subject_vert_example.png" role="presentation">
</label><br>
- <label for="type-org-subject" class="dcf-label">
+ <label for="type-org-subject">
Primary and Secondary ID lockup (A): primary and secondary hierarchy for your full College, Department, Unit or Subject name in a single line design.
</label><br><br>
</div>
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="org_subject_1_2" id="type-org-subject-1-2" <?php if ($context->lockup->style == 'org_subject_1_2') echo 'checked="checked"'; ?>>
- <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/org_subject_1-2_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_subject_1-2_vert_example.png">
+ <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/org_subject_1-2_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_subject_1-2_vert_example.png" role="presentation">
</label><br>
- <label for="type-org-subject-1-2" class="dcf-label">
+ <label for="type-org-subject-1-2">
Primary and Secondary ID lockup (B): primary hierarchy for your full College, Department, Unit or Subject name in one line and secondary hierarchy in a two-line design.
<br><em>*Additional line should be used when ID is too long to fit on one line.</em>
</label><br><br>
@@ -67,23 +71,23 @@
</div>
<div class="dcf-grid-full dcf-grid-halves@sm dcf-col-gap-vw">
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="org_subject_2_1" id="type-org-subject-2-1" <?php if ($context->lockup->style == 'org_subject_2_1') echo 'checked="checked"'; ?>>
- <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/org_subject_2-1_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_subject_2-1_vert_example.png">
+ <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/org_subject_2-1_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_subject_2-1_vert_example.png" role="presentation">
</label><br>
- <label for="type-org-subject-2-1" class="dcf-label">
+ <label for="type-org-subject-2-1">
Primary and Secondary ID lockup (C): primary hierarchy for your full College, Department, Unit or Subject name in two lines and secondary hierarchy in a single line design.
<br><em>*Additional line should be used when ID is too long to fit on one line.</em>
</label><br><br>
</div>
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="org_subject_2_2" id="type-org-subject-2-2" <?php if ($context->lockup->style == 'org_subject_2_2') echo 'checked="checked"'; ?>>
- <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/org_subject_2-2_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_subject_2-2_vert_example.png">
+ <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/org_subject_2-2_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/org_subject_2-2_vert_example.png" role="presentation">
</label><br>
- <label for="type-org-subject-2-2" class="dcf-label">
+ <label for="type-org-subject-2-2">
Primary and Secondary ID lockup (D): primary hierarchy for your full College, Department, Unit or Subject name in two lines and secondary hierarchy in a two-line design.
<br><em>*Additional line should be used when ID is too long to fit on one line.</em>
</label><br><br>
@@ -91,69 +95,69 @@
</div>
<div class="dcf-grid-full dcf-grid-halves@sm dcf-col-gap-vw">
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="acronym" id="type-acronym" <?php if ($context->lockup->style == 'acronym') echo 'checked="checked"'; ?>>
- <img class="horiz height-36" src="<?php echo $context->baseURL; ?>images/acronym_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/acronym_vert_example.png">
+ <img class="horiz height-36" src="<?php echo $context->baseURL; ?>images/acronym_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/acronym_vert_example.png" role="presentation">
</label><br>
- <label for="type-acronym" class="dcf-label">
+ <label for="type-acronym">
Merchandise lockup* (A): primary hierarchy for the shorthand abbreviation of your College, Department, Unit or Subject name in a single line, short character design. Use this version also to create casual lockups for social media. i.e. CASNR, IANR, COJMC.
<br><em>*Restricted to merchandise and social media use only.</em>
</label><br><br>
</div>
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="acronym_subject" id="type-acronym-subject" <?php if ($context->lockup->style == 'acronym_subject') echo 'checked="checked"'; ?>>
- <img class="horiz height-40" src="<?php echo $context->baseURL; ?>images/acronym_subject_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/acronym_subject_vert_example.png">
+ <img class="horiz height-40" src="<?php echo $context->baseURL; ?>images/acronym_subject_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/acronym_subject_vert_example.png" role="presentation">
</label><br>
- <label for="type-acronym-subject" class="dcf-label">
+ <label for="type-acronym-subject"">
Merchandise lockup (B): primary and secondary hierarchy for the shorthand abbreviation of your College, Department, Unit or Subject name in a single line, short character design. Restricted to merchandise use only. i.e. CASNR/ALEC, CEHS/CYFS.
</label><br><br>
</div>
</div>
<div class="dcf-grid-full dcf-grid-halves@sm dcf-col-gap-vw">
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="acronym_subject_2_1" id="type-acronym-subject-2-1" <?php if ($context->lockup->style == 'acronym_subject_2_1') echo 'checked="checked"'; ?>>
- <img class="horiz" src="<?php echo $context->baseURL; ?>images/acronym_subject_2-1_vert_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/acronym_subject_2-1_vert_example.png">
+ <img class="horiz" src="<?php echo $context->baseURL; ?>images/acronym_subject_2-1_vert_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/acronym_subject_2-1_vert_example.png" role="presentation">
</label><br>
- <label for="type-acronym-subject-2-1" class="dcf-label">
+ <label for="type-acronym-subject-2-1">
Embroidery lockup: primary hierarchy for your full College, Department, Unit or Subject name in two lines and secondary hierarchy in a single and optional two-line design.*
<br><em>*Embroidery requires larger text, so we recommend keeping text to a minimum and as few lines of text as possible.</em>
<br><em>**This lockup is vertical style ONLY.</em>
</label><br><br>
</div>
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="extension" id="type-extension" <?php if ($context->lockup->style == 'extension') echo 'checked="checked"'; ?>>
- <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/extension_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/extension_vert_example.png">
+ <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/extension_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/extension_vert_example.png" role="presentation">
</label><br>
- <label for="type-extension" class="dcf-label">
+ <label for="type-extension">
Extension lockup: primary hierarchy for Extension and secondary hierarchy for the counties in a single line design.
</label><br><br>
</div>
</div>
<div class="dcf-grid-full dcf-grid-halves@sm dcf-col-gap-vw">
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="ncta" id="type-ncta" <?php if ($context->lockup->style == 'ncta') echo 'checked="checked"'; ?>>
- <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/ncta_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/ncta_vert_example.png">
+ <img class="horiz height-38" src="<?php echo $context->baseURL; ?>images/ncta_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/ncta_vert_example.png" role="presentation">
</label><br>
- <label for="type-extension" class="dcf-label">
+ <label for="type-extension">
NCTA lockup: primary hierarchy for NCTA and secondary hierarchy for the subject in a single line design.
</label><br><br>
</div>
<div>
- <label class="dcf-label">
+ <label>
<input type="radio" name="type" value="extension_4h" id="type-extension-4h" <?php if ($context->lockup->style == 'extension_4h') echo 'checked="checked"'; ?>>
- <img class="horiz" src="<?php echo $context->baseURL; ?>images/extension_4h_vert_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/extension_4h_vert_example.png">
+ <img class="horiz" src="<?php echo $context->baseURL; ?>images/extension_4h_vert_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/extension_4h_vert_example.png" role="presentation">
</label><br>
- <label for="type-extension-4h" class="dcf-label">
+ <label for="type-extension-4h">
Extension/4H lockup: primary hierarchy for Extension and secondary hierarchy for the counties in a single line design. 4H logo included.
<br><em>*This lockup is vertical style ONLY.</em>
</label><br><br>
@@ -161,12 +165,12 @@
</div>
<div class="dcf-grid-full dcf-grid-halves@sm dcf-col-gap-vw">
<div>
- <label class="center dcf-label">
+ <label class="center>
<input type="radio" name="type" value="acronym_social" id="type-acronym-social" <?php if ($context->lockup->style == 'acronym_social') echo 'checked="checked"'; ?>>
- <img class="horiz" src="<?php echo $context->baseURL; ?>images/acronym_social_vert_example.png">
- <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/acronym_social_vert_example.png">
+ <img class="horiz" src="<?php echo $context->baseURL; ?>images/acronym_social_vert_example.png" role="presentation">
+ <img class="vert" style="display: none;" src="<?php echo $context->baseURL; ?>images/acronym_social_vert_example.png" role="presentation">
</label><br>
- <label for="type-acronym-social" class="dcf-label">
+ <label for="type-acronym-social">
Social lockup: primary hierarchy for the shorthand abbreviation of your College, Department, Unit or Subject name in a single line, short character design.
<br><em>*This lockup is vertical style ONLY.</em>
</label><br><br>
@@ -184,7 +188,7 @@
</div>
<div id="organization-field">
- <label for="organization" class="dcf-label">Organization</label>
+ <label for="organization">Organization</label>
<div class="tooltip wdn-icon-info italic hang-right">
<div>
31 characters max
@@ -193,7 +197,7 @@
<input class="dcf-input-text" type="text" name="organization" id="organization" maxlength="31" value="<?php echo $context->lockup->organization; ?>">
</div>
<div id="organization-second-line-field" style="display: none;">
- <label for="organization-second-line" class="dcf-label">Organization Second Line</label>
+ <label for="organization-second-line">Organization Second Line</label>
<div class="tooltip wdn-icon-info italic hang-right">
<div>
31 characters max
@@ -202,7 +206,7 @@
<input class="dcf-input-text" type="text" name="organization_second_line" maxlength="31" id="organization-second-line">
</div>
<div id="subject-field" style="display: none;">
- <label for="subject" class="dcf-label">Subject</label>
+ <label for="subject">Subject</label>
<div class="tooltip wdn-icon-info italic hang-right">
<div>
40 characters max
@@ -212,7 +216,7 @@
<br>
</div>
<div id="subject-second-line-field" style="display: none;">
- <label for="subject-second-line" class="dcf-label">Subject Second Line</label>
+ <label for="subject-second-line">Subject Second Line</label>
<div class="tooltip wdn-icon-info italic hang-right">
<div>
40 characters max
@@ -222,7 +226,7 @@
<br>
</div>
<div id="acronym-field" style="display: none;">
- <label for="acronym" class="dcf-label">Acronym</label>
+ <label for="acronym">Acronym</label>
<div class="tooltip wdn-icon-info italic hang-right">
<div>
10 characters max
@@ -232,7 +236,7 @@
<br>
</div>
<div id="acronym-second-line-field" style="display: none;">
- <label for="acronym-second-line" class="dcf-label">Acronym Second Line</label>
+ <label for="acronym-second-line">Acronym Second Line</label>
<div class="tooltip wdn-icon-info italic hang-right">
<div>
10 characters max
@@ -242,7 +246,7 @@
<br>
</div>
<div id="acronym-subject-field" style="display: none;">
- <label for="acronym-subject" class="dcf-label">Subject Acronym</label>
+ <label for="acronym-subject">Subject Acronym</label>
<div class="tooltip wdn-icon-info italic hang-right">
<div>
15 characters max
@@ -252,7 +256,7 @@
<br>
</div>
<div id="extension-county-field" style="display: none;">
- <label for="extension-county" class="dcf-label">Extension County</label>
+ <label for="extension-county">Extension County</label>
<div class="tooltip wdn-icon-info italic hang-right">
<div>
40 characters max
@@ -265,7 +269,7 @@
<fieldset class="dcf-pt-4 dcf-pb-4">
<legend class="dcf-legend">File Name Designations</legend>
- <label class="explanation" class="dcf-label">
+ <label class="explanation">
The content entered in these fields does not affect the
actual text in the lockup. It is used to determine file names for lockups.
</label>
@@ -287,10 +291,10 @@
<fieldset class="dcf-pt-4 dcf-pb-4">
<legend class="dcf-legend">Communicator Approval</legend>
- <label class="explanation dcf-label">
+ <span class="explanation dcf-form-help dcf-mb-4">
Lockup requests will be reviewed for approval by your designated Communicator Contact and University Communication.
- </label><br>
- <label for="approver" class="dcf-label">Select your Communicator Contact:</label>
+ </span><br>
+ <label for="approver">Select your Communicator Contact:</label>
<select id="approver" name="approver" class="dcf-input-select">
<option value="">Select your Communicator Contact</option>
<?php foreach ($context->approvers as $user): ?>