From 715ac35071f25027b3a020c1bd7bfa1bf1b08e98 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Thu, 5 Dec 2019 14:12:42 -0500 Subject: [PATCH] Layout Improvements for Match Reconciliation view (CO-1838). Significant cleanup of CSS and JavaScript files to remove legacy markup from Registry. Ensure topbox layout is consistent across views. --- app/src/Locale/en_US/default.po | 7 +- app/src/Template/Element/javascript.ctp | 15 +- app/src/Template/Layout/default.ctp | 2 +- app/src/Template/Matchgrids/manage.ctp | 2 +- app/src/Template/Matchgrids/reconcile.ctp | 121 ++- app/src/Template/Standard/add-edit-view.ctp | 19 +- app/src/Template/Standard/index.ctp | 33 +- app/webroot/css/co-base.css | 1064 +------------------ app/webroot/css/co-responsive.css | 252 +---- 9 files changed, 162 insertions(+), 1353 deletions(-) diff --git a/app/src/Locale/en_US/default.po b/app/src/Locale/en_US/default.po index a2fb85dfc..9dcfeb63e 100644 --- a/app/src/Locale/en_US/default.po +++ b/app/src/Locale/en_US/default.po @@ -350,8 +350,8 @@ msgstr "Permission" msgid "match.fd.query" msgstr "Query" -msgid "match.fd.referenceid" -msgstr "Reference ID" +msgid "match.fd.referenceids" +msgstr "Reference IDs" msgid "match.fd.referenceid_method" msgstr "Reference ID Assignment Method" @@ -434,6 +434,9 @@ msgstr "Platform" msgid "match.op.add.a" msgstr "Add New {0}" +msgid "match.op.assign.confirm" +msgstr "Are you sure you wish to assign this Reference ID?" + msgid "match.op.AttributeMappings.install.nicknames.en" msgstr "Install English Nicknames" diff --git a/app/src/Template/Element/javascript.ctp b/app/src/Template/Element/javascript.ctp index c46b3f145..042b775fa 100644 --- a/app/src/Template/Element/javascript.ctp +++ b/app/src/Template/Element/javascript.ctp @@ -103,17 +103,6 @@ // END DESKTOP MENU DRAWER BEHAVIOR // USER MENU BEHAVIORS - // Toggle the global search box - $("#global-search label").click(function (e) { - e.stopPropagation(); - if ($("#global-search-box").is(":visible")) { - $("#global-search-box").hide(); - $("#global-search-box").attr("aria-expanded","false"); - } else { - $("#global-search-box").show(); - $("#global-search-box").attr("aria-expanded","true"); - } - }); // Toggle the custom user panel in the user menu $("#user-panel-toggle").click(function(e) { @@ -129,8 +118,8 @@ // Hide custom user menu items on click outside $(document).on('click', function (e) { - if ($(e.target).closest("#user-panel, #global-search-box").length === 0) { - $("#user-panel, #global-search-box").hide(); + if ($(e.target).closest("#user-panel").length === 0) { + $("#user-panel").hide(); } }); diff --git a/app/src/Template/Layout/default.ctp b/app/src/Template/Layout/default.ctp index c994b02c2..65c9db757 100644 --- a/app/src/Template/Layout/default.ctp +++ b/app/src/Template/Layout/default.ctp @@ -100,7 +100,7 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M