diff --git a/public/.DS_Store b/public/.DS_Store
deleted file mode 100644
index b55b8e4a0e25e5962bb6297966fa0ccf9a0ccbd9..0000000000000000000000000000000000000000
Binary files a/public/.DS_Store and /dev/null differ
diff --git a/public/css/custom.css b/public/css/custom.css
index 44b2ae430c7faf2d36e6e6d27fbdf65a105a6771..e1928a855211174b6d7c2d8157bc7ba4201a5eab 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -45,26 +45,12 @@
border-radius: 6px;
}
-.horiz .lockups-preview{
- width: 90%;
- max-width: 600px;
-}
-
-.horiz .lockups-preview .preview {
- width: 100%;
-}
-
-.vert .lockups-preview {
- width: 90%;
- max-width: 600px;
-}
-
.vert .lockups-preview .preview {
- max-height: 450px;
+ max-height: 12em;
}
.table-preview .preview {
- max-height: 150px;
+ max-height: 70px;
}
.lockups-preview {
@@ -129,4 +115,3 @@
box-shadow: 0 2.5em 0 0;
}
}
-
\ No newline at end of file
diff --git a/templates/downloadLockups.html.twig b/templates/downloadLockups.html.twig
index c9dda5566800d938ca202b05c6dfe7b11e278ac9..29a6e4a3d5d4c6306bd82f8b5ee0509fa62e7a1c 100644
--- a/templates/downloadLockups.html.twig
+++ b/templates/downloadLockups.html.twig
@@ -2,7 +2,7 @@
<div class="dcf-wrapper dcf-bleed dcf-pb-7 unl-bg-cream">
<h3>Download Lockup Files</h3>
<div class="dcf-w-max-xl dcf-mr-auto dcf-ml-auto">
- <div class="dcf-grid dcf-grid-halves">
+ <div class="dcf-grid dcf-grid-halves dcf-col-gap-vw">
{% if Lockup.getPreviewH != null%}
<div class="horiz">
<div style="display: inline-block">
@@ -298,4 +298,4 @@ showallBtn.addEventListener("click", function() {
WDN.initializePlugin('notice');
}, false);
</script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/homepage.html.twig b/templates/homepage.html.twig
index f4341cebad1622973ca2ca27e1277a11aa706625..8ace6aae28aff0e6bcb2c7581911098c50d51e72 100644
--- a/templates/homepage.html.twig
+++ b/templates/homepage.html.twig
@@ -107,10 +107,10 @@
<p>
Click "Create a New Lockup" above. You'll need your UNL login credentials.
You'll then choose your lockup style and enter your text. You'll also want to know the "Communicator Contact" for your unit,
- as both he/she and University Communications will approve the icon lockup. Once that's done, you can generate the files and
+ as both he/she and University Communication will approve the icon lockup. Once that's done, you can generate the files and
download a .zip package. Or, download individual files if you don't need them all. They will always be available here!
</p>
</div>
</div>
</div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/lockupsLibrary.html.twig b/templates/lockupsLibrary.html.twig
index 5f2b66f26229dda6d3a095a9891718fb22a34697..e026e19027cfacee8976529dd6e40c0ea212af64 100644
--- a/templates/lockupsLibrary.html.twig
+++ b/templates/lockupsLibrary.html.twig
@@ -97,9 +97,9 @@
{{(item.getCommunicatorStatus == 1) ? "<p>Communicator: <strong>Approved</strong><br></p>" | raw}}
{{(item.getCommunicatorStatus == 2) ? "<p>Communicator: <strong>Rejected</strong><br></p>" | raw}}
- {{(item.getCreativeStatus == 0) ? "<p>University Communications: <strong>Awaiting Approval</strong></p>" | raw}}
- {{(item.getCreativeStatus == 1) ? "<p>University Communications: <strong>Approved</strong></p>" | raw}}
- {{(item.getCreativeStatus == 2) ? "<p>University Communications: <strong>Rejected</strong></p>" | raw}}
+ {{(item.getCreativeStatus == 0) ? "<p>UComm: <strong>Awaiting Approval</strong></p>" | raw}}
+ {{(item.getCreativeStatus == 1) ? "<p>UComm: <strong>Approved</strong></p>" | raw}}
+ {{(item.getCreativeStatus == 2) ? "<p>UComm: <strong>Rejected</strong></p>" | raw}}
</td>
<td data-label="Public">
{{ (item.getPublic == 1) ? "Published" : "Not published" }}
diff --git a/templates/manageLockups.html.twig b/templates/manageLockups.html.twig
index 507cf6f5166aa7959e82309987cf93fff1f5627d..d258e16d2ee474ffa4162c72c09fbcf0f67d9a8f 100644
--- a/templates/manageLockups.html.twig
+++ b/templates/manageLockups.html.twig
@@ -1,7 +1,7 @@
{% block body %}
<div
class="dcf-wrapper dcf-bleed dcf-pb-7 unl-bg-cream">
- <h3>Manage lockups</h3>
+ <h3>Manage Lockups</h3>
<p>Welcome
{{ auth.getUsername }},</p>
<div class="dcf-mb-4">
@@ -17,7 +17,7 @@
</form>
</div>
{% if auth.isCreative or auth.isAdmin %}
- <h4>Lockups needing University Communications approval. </h4>
+ <h4>Lockups needing University Communication approval. </h4>
<table class="dcf-table dcf-table-bordered dcf-table-responsive dcf-table-striped dcf-w-100%">
<thead>
<tr>
@@ -51,9 +51,9 @@
{{(item.getCommunicatorStatus == 1) ? "<p><strong>Communicator</strong>: Approved<br></p>" | raw}}
{{(item.getCommunicatorStatus == 2) ? "<p><strong>Communicator</strong>: Rejected<br></p>" | raw}}
- {{(item.getCreativeStatus == 0) ? "<p><strong>University Communications</strong>: Awaiting Approval</p>" | raw}}
- {{(item.getCreativeStatus == 1) ? "<p><strong>University Communications</strong>: Approved</p>" | raw}}
- {{(item.getCreativeStatus == 2) ? "<p><strong>University Communications</strong>: Rejected</p>" | raw}}
+ {{(item.getCreativeStatus == 0) ? "<p><strong>UComm</strong>: Awaiting Approval</p>" | raw}}
+ {{(item.getCreativeStatus == 1) ? "<p><strong>UComm</strong>: Approved</p>" | raw}}
+ {{(item.getCreativeStatus == 2) ? "<p><strong>UComm</strong>: Rejected</p>" | raw}}
</td>
<td data-label="Actions">
@@ -102,9 +102,9 @@
{{(item.getCommunicatorStatus == 1) ? "<p><strong>Communicator</strong>: Approved<br></p>" | raw}}
{{(item.getCommunicatorStatus == 2) ? "<p><strong>Communicator</strong>: Rejected<br></p>" | raw}}
- {{(item.getCreativeStatus == 0) ? "<p><strong>University Communications</strong>: Awaiting Approval</p>" | raw}}
- {{(item.getCreativeStatus == 1) ? "<p><strong>University Communications</strong>: Approved</p>" | raw}}
- {{(item.getCreativeStatus == 2) ? "<p><strong>University Communications</strong>: Rejected</p>" | raw}}
+ {{(item.getCreativeStatus == 0) ? "<p><strong>UComm</strong>: Awaiting Approval</p>" | raw}}
+ {{(item.getCreativeStatus == 1) ? "<p><strong>UComm</strong>: Approved</p>" | raw}}
+ {{(item.getCreativeStatus == 2) ? "<p><strong>UComm</strong>: Rejected</p>" | raw}}
</td>
<td data-label="Actions">
@@ -152,9 +152,9 @@
{{(item.getCommunicatorStatus == 1) ? "<p><strong>Communicator</strong>: Approved<br></p>" | raw}}
{{(item.getCommunicatorStatus == 2) ? "<p><strong>Communicator</strong>: Rejected<br></p>" | raw}}
- {{(item.getCreativeStatus == 0) ? "<p><strong>University Communications</strong>: Awaiting Approval</p>" | raw}}
- {{(item.getCreativeStatus == 1) ? "<p><strong>University Communications</strong>: Approved</p>" | raw}}
- {{(item.getCreativeStatus == 2) ? "<p><strong>University Communications</strong>: Rejected</p>" | raw}}
+ {{(item.getCreativeStatus == 0) ? "<p><strong>UComm</strong>: Awaiting Approval</p>" | raw}}
+ {{(item.getCreativeStatus == 1) ? "<p><strong>UComm</strong>: Approved</p>" | raw}}
+ {{(item.getCreativeStatus == 2) ? "<p><strong>UComm</strong>: Rejected</p>" | raw}}
</td>
<td data-label="Actions">
diff --git a/templates/previewLockups.html.twig b/templates/previewLockups.html.twig
index 870d70c3900cbfdc78c5d0c2c466fe255dbdbc21..770594813dfc81d2ed3500cbc0134b794ba4e1fa 100644
--- a/templates/previewLockups.html.twig
+++ b/templates/previewLockups.html.twig
@@ -7,7 +7,7 @@
{% endif %}
{% if (user.isApprover == false and user.isCreative == false) %}
- <h3>Edit lockup</h3>
+ <h3>Edit Lockup</h3>
{% if alert_message is not defined %}
<div class="dcf-notice {{(Lockup.getCreativeStatus == 1 and Lockup.getCommunicatorStatus ==1) ? " dcf-notice-success" : "dcf-notice-info" }}" hidden>
@@ -15,20 +15,20 @@
<div>Your lockup {{(Lockup.getCreativeStatus == 1 and
Lockup.getCommunicatorStatus ==1) ? "has been approved" : "is being reviewed"}} by your Communicator
Contact and
- University Communications.</div>
+ University Communication.</div>
</div>
{% endif %}
{% else %}
<h3>Lockup Details</h3>
{% endif %}
- <div class="dcf-grid dcf-grid-full dcf-grid-halves@md">
+ <div class="dcf-grid dcf-grid-full dcf-grid-halves@md dcf-col-gap-vw">
<div>
<h4>
- Preview Lockup
+ Preview
</h4>
{% if Lockup.getPreviewH != null%}
<div class="horiz">
- <div class="lockups-preview dcf-p-3">
+ <div class="lockups-preview dcf-p-4">
{{ Lockup.getPreviewH | raw }}
</div>
<p class="dcf-txt-center">
@@ -40,7 +40,7 @@
{% endif %}
{% if Lockup.getPreviewV != null%}
<div class="vert">
- <div class="lockups-preview dcf-p-3 dcf-txt-center">
+ <div class="lockups-preview dcf-p-4 dcf-txt-center">
{{ Lockup.getPreviewV | raw }}
</div>
<p class="dcf-txt-center">
@@ -186,22 +186,22 @@
{# ucomm block #}
<div class="dcf-p-6 dcf-mb-6 unl-bg-lightest-gray dcf-rounded">
- <h5>University Communications</h5>
+ <h5>University Communication</h5>
{% if (core.hasCreativeFeedback(Lockup.getId)) and (Lockup.getCreativeStatus == 0) %}
<div class="dcf-p-2 dcf-mb-4">
- University Communications: <strong>Feedback received</strong>
+ University Communication: <strong>Feedback received</strong>
</div>
{% elseif (Lockup.getCreativeStatus == 1)%}
<div class="dcf-p-2 dcf-mb-4">
- University Communications: <strong>Approved</strong>
+ University Communication: <strong>Approved</strong>
</div>
{% elseif (Lockup.getCreativeStatus == 2)%}
<div class="dcf-p-2 dcf-mb-4">
- University Communications: <strong>Denied</strong>
+ University Communication: <strong>Denied</strong>
</div>
{% else %}
<div class="dcf-p-2 dcf-mb-4">
- University Communications: <strong>Awaiting Approval</strong>
+ University Communication: <strong>Awaiting Approval</strong>
</div>
{% endif %}
diff --git a/templates/wdnbase.html.twig b/templates/wdnbase.html.twig
index 37bef5b8e574f2a0bbbf5224f7cc0ca421130084..44e7d628fa87b8cd168b3146d99accd78d516bc3 100644
--- a/templates/wdnbase.html.twig
+++ b/templates/wdnbase.html.twig
@@ -43,7 +43,7 @@
{% block contactinfo %}
<div id="dcf-footer-group-1">
<h3 class="dcf-txt-md dcf-bold dcf-uppercase dcf-lh-3 unl-ls-2 unl-cream" id="dcf-footer-group-1-heading">About UNL LOCKUP FACTORY</h3>
- <p>This application is a product of the <a href="https://dxg.unl.edu/">Digital Experience Group at Nebraska</a>. DXG is a partnership of <a href="https://ucomm.unl.edu/">University Communication</a> and <a href="https://its.unl.edu/">Information Technology Services</a>.</p>
+ <p>This application is a product of the <a href="https://dxg.unl.edu/">Digital Experience Group</a> at <a href="https://www.unl.edu/">Nebraska</a>. DXG is a part of <a href="https://ucomm.unl.edu/">University Communication & Marketing</a>.</p>
</div>
<div id="dcf-footer-group-2">
<h3 class="dcf-txt-md dcf-bold dcf-uppercase dcf-lh-3 unl-ls-2 unl-cream" id="dcf-footer-group-2-heading">Related Links</h3>