From 97c91cdd380fdec574181086db73f96775c039b0 Mon Sep 17 00:00:00 2001 From: Ben Keith Date: Thu, 28 May 2020 11:02:24 -0400 Subject: [PATCH 01/11] Dropdown for project organization type, styles to differentiate project terms in term list and make them rectangular, add submit button to search --- .../currentorg/css/current-ltw-projects.css | 21 ++++++++++++++++++ .../css/current-ltw-projects.css.map | 2 +- .../css/current-ltw-projects.min.css | 2 +- .../inc/shortcode-current-ltw-projects.php | 4 ++-- .../currentorg/less/current-ltw-projects.less | 22 +++++++++++++++++++ .../partials/content-projects-list-item.php | 17 +++++++------- .../currentorg/partials/projects-base.php | 18 +++++++++++++++ .../partials/projects-search-form.php | 13 +++++++++++ 8 files changed, 86 insertions(+), 13 deletions(-) diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.css b/wp-content/themes/currentorg/css/current-ltw-projects.css index 74bb7f7..69a4216 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.css +++ b/wp-content/themes/currentorg/css/current-ltw-projects.css @@ -43,4 +43,25 @@ border: 1px solid #343434; padding: 0.75rem; } +.project-tags { + padding: 0; + margin: 1em 0; +} +.project-tags li { + display: inline-block; + padding: 0.5em; + border: 1px solid #343434; +} +.project-tags li + li { + margin-left: 0.5em; +} +.project-tags [class*=project-status] { + background: yellow; +} +.project-tags [class*=project-org-type] { + background: aliceblue; +} +.project-tags [class*=project-category] { + background: lavender; +} /*# sourceMappingURL=css/current-ltw-projects.css.map */ \ No newline at end of file diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.css.map b/wp-content/themes/currentorg/css/current-ltw-projects.css.map index 598e77c..d5cdd25 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.css.map +++ b/wp-content/themes/currentorg/css/current-ltw-projects.css.map @@ -1 +1 @@ -{"version":3,"sources":["less/current-ltw-projects.less"],"names":[],"mappings":";;;AAKA;EACC,gBAAA;;AAEA;EACC,QAA4B;IAA5B;MACC,aAAA;MACA,8BAAA;MACA,qBACC,gBACA,aAFD;MAIA,gBAAA;MACA,WAAA;;;EATF,sBAWC;IACC,iBAAA;;EAZF,sBAcC;IACC,eAAA;;EAfF,sBAiBC;IACC,iBAAA;;;AAKH;EACC,iBAAA;EACA,gCAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AACA,mBAAE;EACD,mBAAA;;AAGF;EACC,yBAAA;EACA,gBAAA","sourcesContent":["@import \"vars.less\";\n\n// this sets common values for a lot of padding and margins in this file\n@common-whitespace: 1.5rem;\n\n.current-ltw-shortcode {\n\tmargin: @common-whitespace 0;\n\n\t@supports( display: grid ) {\n\t\t@media ( min-width: 771px ) {\n\t\t\tdisplay: grid;\n\t\t\tgrid-template-columns: 5fr 7fr;\n\t\t\tgrid-template-areas:\n\t\t\t\t\"search search\"\n\t\t\t\t\"list single\"\n\t\t\t;\n\t\t\tgrid-gap: @common-whitespace;\n\t\t\tgap: @common-whitespace;\n\t\t}\n\t\t.projects-search-form {\n\t\t\tgrid-area: search;\n\t\t}\n\t\t.projects-list {\n\t\t\tgrid-area: list;\n\t\t}\n\t\t.projects-single-holder {\n\t\t\tgrid-area: single;\n\t\t}\n\t}\n}\n\n.projects-search-form {\n\tpadding: @common-whitespace 0;\n\tborder-bottom: 1px solid @grey-d;\n}\n.projects-list {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.projects-list-item {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t& + .projects-list-item {\n\t\tmargin-top: @common-whitespace * 0.5;\n\t}\n}\n.projects-single-holder {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n"]} \ No newline at end of file +{"version":3,"sources":["less/current-ltw-projects.less"],"names":[],"mappings":";;;AAKA;EACC,gBAAA;;AAEA;EACC,QAA4B;IAA5B;MACC,aAAA;MACA,8BAAA;MACA,qBACC,gBACA,aAFD;MAIA,gBAAA;MACA,WAAA;;;EATF,sBAWC;IACC,iBAAA;;EAZF,sBAcC;IACC,eAAA;;EAfF,sBAiBC;IACC,iBAAA;;;AAKH;EACC,iBAAA;EACA,gCAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AACA,mBAAE;EACD,mBAAA;;AAGF;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,UAAA;EACA,aAAA;;AAFD,aAGC;EACC,qBAAA;EACA,cAAA;EACA,yBAAA;;AAEA,aALD,GAKG;EACD,kBAAA;;AATH,aAYC;EACC,kBAAA;;AAbF,aAeC;EACC,qBAAA;;AAhBF,aAkBC;EACC,oBAAA","sourcesContent":["@import \"vars.less\";\n\n// this sets common values for a lot of padding and margins in this file\n@common-whitespace: 1.5rem;\n\n.current-ltw-shortcode {\n\tmargin: @common-whitespace 0;\n\n\t@supports( display: grid ) {\n\t\t@media ( min-width: 771px ) {\n\t\t\tdisplay: grid;\n\t\t\tgrid-template-columns: 5fr 7fr;\n\t\t\tgrid-template-areas:\n\t\t\t\t\"search search\"\n\t\t\t\t\"list single\"\n\t\t\t;\n\t\t\tgrid-gap: @common-whitespace;\n\t\t\tgap: @common-whitespace;\n\t\t}\n\t\t.projects-search-form {\n\t\t\tgrid-area: search;\n\t\t}\n\t\t.projects-list {\n\t\t\tgrid-area: list;\n\t\t}\n\t\t.projects-single-holder {\n\t\t\tgrid-area: single;\n\t\t}\n\t}\n}\n\n.projects-search-form {\n\tpadding: @common-whitespace 0;\n\tborder-bottom: 1px solid @grey-d;\n}\n.projects-list {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.projects-list-item {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t& + .projects-list-item {\n\t\tmargin-top: @common-whitespace * 0.5;\n\t}\n}\n.projects-single-holder {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.project-tags {\n\tpadding: 0;\n\tmargin: 1em 0;\n\tli {\n\t\tdisplay: inline-block;\n\t\tpadding: 0.5em;\n\t\tborder: 1px solid @grey-d;\n\n\t\t& + li {\n\t\t\tmargin-left: 0.5em;\n\t\t}\n\t}\n\t[class*=project-status] {\n\t\tbackground: yellow;\n\t}\n\t[class*=project-org-type] {\n\t\tbackground: aliceblue;\n\t}\n\t[class*=project-category] {\n\t\tbackground: lavender;\n\t}\n}\n"]} \ No newline at end of file diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.min.css b/wp-content/themes/currentorg/css/current-ltw-projects.min.css index 5ceefa4..66b9d1d 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.min.css +++ b/wp-content/themes/currentorg/css/current-ltw-projects.min.css @@ -1 +1 @@ -.current-ltw-shortcode{margin:1.5rem 0}@supports (display:grid){@media (min-width:771px){.current-ltw-shortcode{display:grid;grid-template-columns:5fr 7fr;grid-template-areas:"search search" "list single";grid-gap:1.5rem;gap:1.5rem}}.current-ltw-shortcode .projects-search-form{grid-area:search}.current-ltw-shortcode .projects-list{grid-area:list}.current-ltw-shortcode .projects-single-holder{grid-area:single}}.projects-search-form{padding:1.5rem 0;border-bottom:1px solid #343434}.projects-list{border:1px solid #343434;padding:.75rem}.projects-list-item{border:1px solid #343434;padding:.75rem}.projects-list-item+.projects-list-item{margin-top:.75rem}.projects-single-holder{border:1px solid #343434;padding:.75rem} \ No newline at end of file +.current-ltw-shortcode{margin:1.5rem 0}@supports (display:grid){@media (min-width:771px){.current-ltw-shortcode{display:grid;grid-template-columns:5fr 7fr;grid-template-areas:"search search" "list single";grid-gap:1.5rem;gap:1.5rem}}.current-ltw-shortcode .projects-search-form{grid-area:search}.current-ltw-shortcode .projects-list{grid-area:list}.current-ltw-shortcode .projects-single-holder{grid-area:single}}.projects-search-form{padding:1.5rem 0;border-bottom:1px solid #343434}.projects-list{border:1px solid #343434;padding:.75rem}.projects-list-item{border:1px solid #343434;padding:.75rem}.projects-list-item+.projects-list-item{margin-top:.75rem}.projects-single-holder{border:1px solid #343434;padding:.75rem}.project-tags{padding:0;margin:1em 0}.project-tags li{display:inline-block;padding:.5em;border:1px solid #343434}.project-tags li+li{margin-left:.5em}.project-tags [class*=project-status]{background:#ff0}.project-tags [class*=project-org-type]{background:#f0f8ff}.project-tags [class*=project-category]{background:#e6e6fa} \ No newline at end of file diff --git a/wp-content/themes/currentorg/inc/shortcode-current-ltw-projects.php b/wp-content/themes/currentorg/inc/shortcode-current-ltw-projects.php index 1826ec4..7fe15c2 100644 --- a/wp-content/themes/currentorg/inc/shortcode-current-ltw-projects.php +++ b/wp-content/themes/currentorg/inc/shortcode-current-ltw-projects.php @@ -15,8 +15,8 @@ * @param String $tag the shortcode tag. * @link https://developer.wordpress.org/plugins/shortcodes/shortcodes-with-parameters/#complete-example */ -function current_ltw_projects_shortcode( $atts = [], $content = null, $tag = '') -{ +function current_ltw_projects_shortcode( $atts = [], $content = null, $tag = '') { + // normalize attribute keys, lowercase $atts = array_change_key_case((array)$atts, CASE_LOWER); diff --git a/wp-content/themes/currentorg/less/current-ltw-projects.less b/wp-content/themes/currentorg/less/current-ltw-projects.less index bd37ac3..83216aa 100644 --- a/wp-content/themes/currentorg/less/current-ltw-projects.less +++ b/wp-content/themes/currentorg/less/current-ltw-projects.less @@ -48,3 +48,25 @@ border: 1px solid @grey-d; padding: @common-whitespace * 0.5; } +.project-tags { + padding: 0; + margin: 1em 0; + li { + display: inline-block; + padding: 0.5em; + border: 1px solid @grey-d; + + & + li { + margin-left: 0.5em; + } + } + [class*=project-status] { + background: yellow; + } + [class*=project-org-type] { + background: aliceblue; + } + [class*=project-category] { + background: lavender; + } +} diff --git a/wp-content/themes/currentorg/partials/content-projects-list-item.php b/wp-content/themes/currentorg/partials/content-projects-list-item.php index 16fb237..d6f699c 100644 --- a/wp-content/themes/currentorg/partials/content-projects-list-item.php +++ b/wp-content/themes/currentorg/partials/content-projects-list-item.php @@ -50,15 +50,14 @@ // we may need to redo these links as search query params instead $status = get_the_terms( get_the_ID(), 'project-status' ); $categories = get_the_terms( get_the_ID(), 'project-category' ); - // @todo this throws errors when no terms are found for this type of post - if ( is_array( $status) && is_array( $status ) ) { - $terms = array_merge( $status, $categories ); - } else if ( is_array( $status ) ) { - $terms = $status; - } else if ( is_array( $categories ) ) { - $terms = $categories; - } else { - $terms = array(); + $org_types = get_the_terms( get_the_ID(), 'project-org-type' ); + + $terms = array(); + foreach ( array( 'project-status', 'project-category', 'project-org-type' ) as $tax ) { + $tax_terms = get_the_terms( get_the_ID(), $tax ); + if ( is_array( $tax_terms ) ) { + $terms = array_merge( $terms, $tax_terms ); + } } if ( ! empty( $terms ) ) { diff --git a/wp-content/themes/currentorg/partials/projects-base.php b/wp-content/themes/currentorg/partials/projects-base.php index 166164a..8e19ef4 100644 --- a/wp-content/themes/currentorg/partials/projects-base.php +++ b/wp-content/themes/currentorg/partials/projects-base.php @@ -9,9 +9,27 @@ 'post_type' => 'projects', 'post_status' => 'publish', ); + if ( isset( $_GET['projects-search'] ) && ! empty( $_GET['projects-search'] ) ) { $args['s'] = sanitize_title_for_query( $_GET['projects-search'] ); } + +$tax_query = array(); +if ( isset( $_GET['project-org-type'] ) && ! empty( $_GET['project-org-type'] ) ) { + $tax_query[] = array( + 'taxonomy' => 'project-org-type', + 'terms' => sanitize_title_for_query( $_GET['project-org-type'] ), + 'field' => 'term_id', + ); +} +if ( ! empty( $tax_query ) ) { + $args['tax_query'] = $tax_query; +} +if ( count( $tax_query ) > 1 ) { + $args['tax_query']['relation'] = 'AND'; +} + + $query = new WP_Query( $args ); // so we can pass $query to these diff --git a/wp-content/themes/currentorg/partials/projects-search-form.php b/wp-content/themes/currentorg/partials/projects-search-form.php index b1999f4..f6c2deb 100644 --- a/wp-content/themes/currentorg/partials/projects-search-form.php +++ b/wp-content/themes/currentorg/partials/projects-search-form.php @@ -20,5 +20,18 @@ + + From cc52741557d1b133fe4c1ee4170be013e93cedaf Mon Sep 17 00:00:00 2001 From: Ben Keith Date: Thu, 28 May 2020 13:56:56 -0400 Subject: [PATCH 02/11] Working filter for terms --- .../currentorg/partials/projects-base.php | 27 +++++++++++++++---- .../partials/projects-search-form.php | 13 +++++++++ 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/wp-content/themes/currentorg/partials/projects-base.php b/wp-content/themes/currentorg/partials/projects-base.php index 8e19ef4..9c7d5d2 100644 --- a/wp-content/themes/currentorg/partials/projects-base.php +++ b/wp-content/themes/currentorg/partials/projects-base.php @@ -16,11 +16,28 @@ $tax_query = array(); if ( isset( $_GET['project-org-type'] ) && ! empty( $_GET['project-org-type'] ) ) { - $tax_query[] = array( - 'taxonomy' => 'project-org-type', - 'terms' => sanitize_title_for_query( $_GET['project-org-type'] ), - 'field' => 'term_id', - ); + $term = sanitize_title_for_query( $_GET['project-org-type'] ); + if ( ! empty( $term ) && is_numeric( $term ) ) { + $tax_query[] = array( + 'taxonomy' => 'project-org-type', + 'terms' => $term, + 'field' => 'term_id', + ); + } + unset( $term ); +} +if ( isset( $_GET['tax_input']['project-category'] ) && is_array( $_GET['tax_input']['project-category'] ) ) { + foreach( $_GET['tax_input']['project-category'] as $term ) { + $term = sanitize_title_for_query( $term ); + if ( ! empty( $term ) && is_numeric( $term ) ) { + $tax_query[] = array( + 'taxonomy' => 'project-category', + 'field' => 'term_id', + 'terms' => $term, + ); + } + unset( $term ); + } } if ( ! empty( $tax_query ) ) { $args['tax_query'] = $tax_query; diff --git a/wp-content/themes/currentorg/partials/projects-search-form.php b/wp-content/themes/currentorg/partials/projects-search-form.php index f6c2deb..b43aede 100644 --- a/wp-content/themes/currentorg/partials/projects-search-form.php +++ b/wp-content/themes/currentorg/partials/projects-search-form.php @@ -1,4 +1,12 @@ query_vars['s']; @@ -31,6 +39,11 @@ 'taxonomy' => 'project-org-type', 'selected' => ( isset( $_GET['project-org-type'] ) ) ? (int) $_GET['project-org-type'] : '' , ) ); + error_log(var_export( $_GET['tax_input'], true)); + wp_terms_checklist( null, array( + 'taxonomy' => 'project-category', + 'selected_cats' => ( isset( $_GET['tax_input']['project-category'] ) && is_array( $_GET['tax_input']['project-category'] ) ) ? $_GET['tax_input']['project-category'] : '' , + ) ); ?> From 1748e424150369baf9ba8f5b3315006aa4e2fcd5 Mon Sep 17 00:00:00 2001 From: Ben Keith Date: Thu, 28 May 2020 14:33:14 -0400 Subject: [PATCH 03/11] Filter the search options by category --- .../currentorg/css/current-ltw-projects.css | 53 ++++++++++++++++++- .../css/current-ltw-projects.css.map | 2 +- .../css/current-ltw-projects.min.css | 2 +- .../currentorg/less/current-ltw-projects.less | 48 ++++++++++++++++- .../partials/projects-search-form.php | 25 ++++++--- 5 files changed, 117 insertions(+), 13 deletions(-) diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.css b/wp-content/themes/currentorg/css/current-ltw-projects.css index 69a4216..d877c35 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.css +++ b/wp-content/themes/currentorg/css/current-ltw-projects.css @@ -14,7 +14,7 @@ gap: 1.5rem; } } - .current-ltw-shortcode .projects-search-form { + .current-ltw-shortcode .projects-search-form-search { grid-area: search; } .current-ltw-shortcode .projects-list { @@ -24,10 +24,59 @@ grid-area: single; } } -.projects-search-form { +.projects-search-form-search { padding: 1.5rem 0; border-bottom: 1px solid #343434; } +.projects-search-form-search input, +.projects-search-form-search .btn, +.projects-search-form-search button, +.projects-search-form-search select { + padding: 4px; +} +.projects-search-form-search input, +.projects-search-form-search .btn, +.projects-search-form-search button, +.projects-search-form-search details, +.projects-search-form-search select, +.projects-search-form-search label { + box-sizing: border-box; + line-height: 1.5; + font-size: 16px; + border-radius: 0; + height: unset; + margin-top: 0; + margin-bottom: 0; + display: inline-block; + vertical-align: middle; + float: left; +} +.projects-search-form-search .btn-submit { + border: 1px solid #666666; + background-color: #1c819e; + color: white; +} +.projects-search-form-search .project-category .btn::after { + content: "\1f893"; + display: inline; +} +.projects-search-form-search details[open] { + border: 1px solid #343434; + position: relative; + top: 0; + vertical-align: top; + max-height: 50vh; + overflow: scroll; +} +.projects-search-form-search details li { + display: list-item; + list-style: none; + margin-bottom: 0; +} +.projects-search-form-search details label { + float: none; + clear: both; +} .projects-list { border: 1px solid #343434; padding: 0.75rem; diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.css.map b/wp-content/themes/currentorg/css/current-ltw-projects.css.map index d5cdd25..d1da565 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.css.map +++ b/wp-content/themes/currentorg/css/current-ltw-projects.css.map @@ -1 +1 @@ -{"version":3,"sources":["less/current-ltw-projects.less"],"names":[],"mappings":";;;AAKA;EACC,gBAAA;;AAEA;EACC,QAA4B;IAA5B;MACC,aAAA;MACA,8BAAA;MACA,qBACC,gBACA,aAFD;MAIA,gBAAA;MACA,WAAA;;;EATF,sBAWC;IACC,iBAAA;;EAZF,sBAcC;IACC,eAAA;;EAfF,sBAiBC;IACC,iBAAA;;;AAKH;EACC,iBAAA;EACA,gCAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AACA,mBAAE;EACD,mBAAA;;AAGF;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,UAAA;EACA,aAAA;;AAFD,aAGC;EACC,qBAAA;EACA,cAAA;EACA,yBAAA;;AAEA,aALD,GAKG;EACD,kBAAA;;AATH,aAYC;EACC,kBAAA;;AAbF,aAeC;EACC,qBAAA;;AAhBF,aAkBC;EACC,oBAAA","sourcesContent":["@import \"vars.less\";\n\n// this sets common values for a lot of padding and margins in this file\n@common-whitespace: 1.5rem;\n\n.current-ltw-shortcode {\n\tmargin: @common-whitespace 0;\n\n\t@supports( display: grid ) {\n\t\t@media ( min-width: 771px ) {\n\t\t\tdisplay: grid;\n\t\t\tgrid-template-columns: 5fr 7fr;\n\t\t\tgrid-template-areas:\n\t\t\t\t\"search search\"\n\t\t\t\t\"list single\"\n\t\t\t;\n\t\t\tgrid-gap: @common-whitespace;\n\t\t\tgap: @common-whitespace;\n\t\t}\n\t\t.projects-search-form {\n\t\t\tgrid-area: search;\n\t\t}\n\t\t.projects-list {\n\t\t\tgrid-area: list;\n\t\t}\n\t\t.projects-single-holder {\n\t\t\tgrid-area: single;\n\t\t}\n\t}\n}\n\n.projects-search-form {\n\tpadding: @common-whitespace 0;\n\tborder-bottom: 1px solid @grey-d;\n}\n.projects-list {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.projects-list-item {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t& + .projects-list-item {\n\t\tmargin-top: @common-whitespace * 0.5;\n\t}\n}\n.projects-single-holder {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.project-tags {\n\tpadding: 0;\n\tmargin: 1em 0;\n\tli {\n\t\tdisplay: inline-block;\n\t\tpadding: 0.5em;\n\t\tborder: 1px solid @grey-d;\n\n\t\t& + li {\n\t\t\tmargin-left: 0.5em;\n\t\t}\n\t}\n\t[class*=project-status] {\n\t\tbackground: yellow;\n\t}\n\t[class*=project-org-type] {\n\t\tbackground: aliceblue;\n\t}\n\t[class*=project-category] {\n\t\tbackground: lavender;\n\t}\n}\n"]} \ No newline at end of file +{"version":3,"sources":["less/current-ltw-projects.less"],"names":[],"mappings":";;;AAKA;EACC,gBAAA;;AAEA;EACC,QAA4B;IAA5B;MACC,aAAA;MACA,8BAAA;MACA,qBACC,gBACA,aAFD;MAIA,gBAAA;MACA,WAAA;;;EATF,sBAWC;IACC,iBAAA;;EAZF,sBAcC;IACC,eAAA;;EAfF,sBAiBC;IACC,iBAAA;;;AAKH;EACC,iBAAA;EACA,gCAAA;;AAFD,4BAGC;AAHD,4BAGQ;AAHR,4BAGc;AAHd,4BAGsB;EACpB,YAAA;;AAJF,4BAMC;AAND,4BAMQ;AANR,4BAMc;AANd,4BAMsB;AANtB,4BAM+B;AAN/B,4BAMuC;EACrC,sBAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,aAAA;EACA,aAAA;EACA,gBAAA;EACA,qBAAA;EACA,sBAAA;EACA,WAAA;;AAhBF,4BAkBC;EACC,yBAAA;EACA,yBAAA;EACA,YAAA;;AArBF,4BAuBC,kBAAkB,KAAI;EACrB,SAAS,QAAT;EACA,eAAA;;AAzBF,4BA4BC,QAAO;EACN,yBAAA;EACA,kBAAA;EACA,MAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;;AAlCF,4BAoCC,QACC;EACC,kBAAA;EACA,gBAAA;EACA,gBAAA;;AAxCH,4BAoCC,QAMC;EACC,WAAA;EACA,WAAA;;AAIH;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AACA,mBAAE;EACD,mBAAA;;AAGF;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,UAAA;EACA,aAAA;;AAFD,aAGC;EACC,qBAAA;EACA,cAAA;EACA,yBAAA;;AAEA,aALD,GAKG;EACD,kBAAA;;AATH,aAYC;EACC,kBAAA;;AAbF,aAeC;EACC,qBAAA;;AAhBF,aAkBC;EACC,oBAAA","sourcesContent":["@import \"vars.less\";\n\n// this sets common values for a lot of padding and margins in this file\n@common-whitespace: 1.5rem;\n\n.current-ltw-shortcode {\n\tmargin: @common-whitespace 0;\n\n\t@supports( display: grid ) {\n\t\t@media ( min-width: 771px ) {\n\t\t\tdisplay: grid;\n\t\t\tgrid-template-columns: 5fr 7fr;\n\t\t\tgrid-template-areas:\n\t\t\t\t\"search search\"\n\t\t\t\t\"list single\"\n\t\t\t;\n\t\t\tgrid-gap: @common-whitespace;\n\t\t\tgap: @common-whitespace;\n\t\t}\n\t\t.projects-search-form-search {\n\t\t\tgrid-area: search;\n\t\t}\n\t\t.projects-list {\n\t\t\tgrid-area: list;\n\t\t}\n\t\t.projects-single-holder {\n\t\t\tgrid-area: single;\n\t\t}\n\t}\n}\n\n.projects-search-form-search {\n\tpadding: @common-whitespace 0;\n\tborder-bottom: 1px solid @grey-d;\n\tinput, .btn, button, select {\n\t\tpadding: 4px;\n\t}\n\tinput, .btn, button, details, select, label {\n\t\tbox-sizing: border-box;\n\t\tline-height: 1.5;\n\t\tfont-size: 16px;\n\t\tborder-radius: 0;\n\t\theight: unset;\n\t\tmargin-top: 0;\n\t\tmargin-bottom: 0;\n\t\tdisplay: inline-block;\n\t\tvertical-align: middle;\n\t\tfloat: left;\n\t}\n\t.btn-submit {\n\t\tborder: 1px solid @grey-m;\n\t\tbackground-color: @brand;\n\t\tcolor: white;\n\t}\n\t.project-category .btn::after {\n\t\tcontent: \"\\1f893\";\n\t\tdisplay: inline;\n\t}\n\t\n\tdetails[open] {\n\t\tborder: 1px solid @grey-d;\n\t\tposition: relative;\n\t\ttop: 0;\n\t\tvertical-align: top;\n\t\tmax-height: 50vh;\n\t\toverflow: scroll;\n\t}\n\tdetails {\n\t\tli {\n\t\t\tdisplay: list-item;\n\t\t\tlist-style: none;\n\t\t\tmargin-bottom: 0;\n\t\t}\n\t\tlabel {\n\t\t\tfloat: none;\n\t\t\tclear: both;\n\t\t}\n\t}\n}\n.projects-list {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.projects-list-item {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t& + .projects-list-item {\n\t\tmargin-top: @common-whitespace * 0.5;\n\t}\n}\n.projects-single-holder {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.project-tags {\n\tpadding: 0;\n\tmargin: 1em 0;\n\tli {\n\t\tdisplay: inline-block;\n\t\tpadding: 0.5em;\n\t\tborder: 1px solid @grey-d;\n\n\t\t& + li {\n\t\t\tmargin-left: 0.5em;\n\t\t}\n\t}\n\t[class*=project-status] {\n\t\tbackground: yellow;\n\t}\n\t[class*=project-org-type] {\n\t\tbackground: aliceblue;\n\t}\n\t[class*=project-category] {\n\t\tbackground: lavender;\n\t}\n}\n"]} \ No newline at end of file diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.min.css b/wp-content/themes/currentorg/css/current-ltw-projects.min.css index 66b9d1d..4ff19a3 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.min.css +++ b/wp-content/themes/currentorg/css/current-ltw-projects.min.css @@ -1 +1 @@ -.current-ltw-shortcode{margin:1.5rem 0}@supports (display:grid){@media (min-width:771px){.current-ltw-shortcode{display:grid;grid-template-columns:5fr 7fr;grid-template-areas:"search search" "list single";grid-gap:1.5rem;gap:1.5rem}}.current-ltw-shortcode .projects-search-form{grid-area:search}.current-ltw-shortcode .projects-list{grid-area:list}.current-ltw-shortcode .projects-single-holder{grid-area:single}}.projects-search-form{padding:1.5rem 0;border-bottom:1px solid #343434}.projects-list{border:1px solid #343434;padding:.75rem}.projects-list-item{border:1px solid #343434;padding:.75rem}.projects-list-item+.projects-list-item{margin-top:.75rem}.projects-single-holder{border:1px solid #343434;padding:.75rem}.project-tags{padding:0;margin:1em 0}.project-tags li{display:inline-block;padding:.5em;border:1px solid #343434}.project-tags li+li{margin-left:.5em}.project-tags [class*=project-status]{background:#ff0}.project-tags [class*=project-org-type]{background:#f0f8ff}.project-tags [class*=project-category]{background:#e6e6fa} \ No newline at end of file +.current-ltw-shortcode{margin:1.5rem 0}@supports (display:grid){@media (min-width:771px){.current-ltw-shortcode{display:grid;grid-template-columns:5fr 7fr;grid-template-areas:"search search" "list single";grid-gap:1.5rem;gap:1.5rem}}.current-ltw-shortcode .projects-search-form-search{grid-area:search}.current-ltw-shortcode .projects-list{grid-area:list}.current-ltw-shortcode .projects-single-holder{grid-area:single}}.projects-search-form-search{padding:1.5rem 0;border-bottom:1px solid #343434}.projects-search-form-search .btn,.projects-search-form-search button,.projects-search-form-search input,.projects-search-form-search select{padding:4px}.projects-search-form-search .btn,.projects-search-form-search button,.projects-search-form-search details,.projects-search-form-search input,.projects-search-form-search label,.projects-search-form-search select{box-sizing:border-box;line-height:1.5;font-size:16px;border-radius:0;height:unset;margin-top:0;margin-bottom:0;display:inline-block;vertical-align:middle;float:left}.projects-search-form-search .btn-submit{border:1px solid #666;background-color:#1c819e;color:#fff}.projects-search-form-search .project-category .btn::after{content:"\1f893";display:inline}.projects-search-form-search details[open]{border:1px solid #343434;position:relative;top:0;vertical-align:top;max-height:50vh;overflow:scroll}.projects-search-form-search details li{display:list-item;list-style:none;margin-bottom:0}.projects-search-form-search details label{float:none;clear:both}.projects-list{border:1px solid #343434;padding:.75rem}.projects-list-item{border:1px solid #343434;padding:.75rem}.projects-list-item+.projects-list-item{margin-top:.75rem}.projects-single-holder{border:1px solid #343434;padding:.75rem}.project-tags{padding:0;margin:1em 0}.project-tags li{display:inline-block;padding:.5em;border:1px solid #343434}.project-tags li+li{margin-left:.5em}.project-tags [class*=project-status]{background:#ff0}.project-tags [class*=project-org-type]{background:#f0f8ff}.project-tags [class*=project-category]{background:#e6e6fa} \ No newline at end of file diff --git a/wp-content/themes/currentorg/less/current-ltw-projects.less b/wp-content/themes/currentorg/less/current-ltw-projects.less index 83216aa..a389891 100644 --- a/wp-content/themes/currentorg/less/current-ltw-projects.less +++ b/wp-content/themes/currentorg/less/current-ltw-projects.less @@ -17,7 +17,7 @@ grid-gap: @common-whitespace; gap: @common-whitespace; } - .projects-search-form { + .projects-search-form-search { grid-area: search; } .projects-list { @@ -29,9 +29,53 @@ } } -.projects-search-form { +.projects-search-form-search { padding: @common-whitespace 0; border-bottom: 1px solid @grey-d; + input, .btn, button, select { + padding: 4px; + } + input, .btn, button, details, select, label { + box-sizing: border-box; + line-height: 1.5; + font-size: 16px; + border-radius: 0; + height: unset; + margin-top: 0; + margin-bottom: 0; + display: inline-block; + vertical-align: middle; + float: left; + } + .btn-submit { + border: 1px solid @grey-m; + background-color: @brand; + color: white; + } + .project-category .btn::after { + content: "\1f893"; + display: inline; + } + + details[open] { + border: 1px solid @grey-d; + position: relative; + top: 0; + vertical-align: top; + max-height: 50vh; + overflow: scroll; + } + details { + li { + display: list-item; + list-style: none; + margin-bottom: 0; + } + label { + float: none; + clear: both; + } + } } .projects-list { border: 1px solid @grey-d; diff --git a/wp-content/themes/currentorg/partials/projects-search-form.php b/wp-content/themes/currentorg/partials/projects-search-form.php index b43aede..583e8bd 100644 --- a/wp-content/themes/currentorg/partials/projects-search-form.php +++ b/wp-content/themes/currentorg/partials/projects-search-form.php @@ -25,26 +25,37 @@ From ea10fe45f921732353320e454b9cb704f87a0855 Mon Sep 17 00:00:00 2001 From: Ben Keith Date: Thu, 28 May 2020 14:48:44 -0400 Subject: [PATCH 04/11] Save some unneeded queries --- .../currentorg/partials/content-projects-list-item.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wp-content/themes/currentorg/partials/content-projects-list-item.php b/wp-content/themes/currentorg/partials/content-projects-list-item.php index d6f699c..86340e4 100644 --- a/wp-content/themes/currentorg/partials/content-projects-list-item.php +++ b/wp-content/themes/currentorg/partials/content-projects-list-item.php @@ -47,10 +47,8 @@ Date: Tue, 2 Jun 2020 17:07:33 -0400 Subject: [PATCH 05/11] Make term links match params of term search --- .../themes/currentorg/partials/content-projects-list-item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-content/themes/currentorg/partials/content-projects-list-item.php b/wp-content/themes/currentorg/partials/content-projects-list-item.php index 86340e4..982b492 100644 --- a/wp-content/themes/currentorg/partials/content-projects-list-item.php +++ b/wp-content/themes/currentorg/partials/content-projects-list-item.php @@ -66,7 +66,7 @@ esc_attr( $term->taxonomy ), esc_attr( $term->slug ), // @todo: make this be a link that triggers the search filter for this term - get_term_link( $term ), + esc_attr( '?' . $term->taxonomy . '=' . $term->term_id ), esc_html( $term->name ) ); } From 62a001b4127cf935a3de10532b53a8d663b700b8 Mon Sep 17 00:00:00 2001 From: Ben Keith Date: Tue, 2 Jun 2020 17:34:36 -0400 Subject: [PATCH 06/11] Search styles improvement --- wp-content/themes/currentorg/css/current-ltw-projects.css | 7 ++++++- .../themes/currentorg/css/current-ltw-projects.css.map | 2 +- .../themes/currentorg/css/current-ltw-projects.min.css | 2 +- .../themes/currentorg/less/current-ltw-projects.less | 5 ++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.css b/wp-content/themes/currentorg/css/current-ltw-projects.css index cdac6aa..98c6f0d 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.css +++ b/wp-content/themes/currentorg/css/current-ltw-projects.css @@ -29,6 +29,12 @@ border-bottom: 1px solid #343434; } .projects-search-form-search input, +.projects-search-form-search button, +.projects-search-form-search select, +.projects-search-form-search details { + border: 1px solid #666666; +} +.projects-search-form-search input, .projects-search-form-search .btn, .projects-search-form-search button, .projects-search-form-search select { @@ -52,7 +58,6 @@ float: left; } .projects-search-form-search .btn-submit { - border: 1px solid #666666; background-color: #1c819e; color: white; } diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.css.map b/wp-content/themes/currentorg/css/current-ltw-projects.css.map index 8306065..76b6440 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.css.map +++ b/wp-content/themes/currentorg/css/current-ltw-projects.css.map @@ -1 +1 @@ -{"version":3,"sources":["less/current-ltw-projects.less"],"names":[],"mappings":";;;AAKA;EACC,gBAAA;;AAEA;EACC,QAA4B;IAA5B;MACC,aAAA;MACA,8BAAA;MACA,qBACC,gBACA,aAFD;MAIA,gBAAA;MACA,WAAA;;;EATF,sBAWC;IACC,iBAAA;;EAZF,sBAcC;IACC,eAAA;;EAfF,sBAiBC;IACC,iBAAA;;;AAKH;EACC,iBAAA;EACA,gCAAA;;AAFD,4BAGC;AAHD,4BAGQ;AAHR,4BAGc;AAHd,4BAGsB;EACpB,YAAA;;AAJF,4BAMC;AAND,4BAMQ;AANR,4BAMc;AANd,4BAMsB;AANtB,4BAM+B;AAN/B,4BAMuC;EACrC,sBAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,aAAA;EACA,aAAA;EACA,gBAAA;EACA,qBAAA;EACA,sBAAA;EACA,WAAA;;AAhBF,4BAkBC;EACC,yBAAA;EACA,yBAAA;EACA,YAAA;;AArBF,4BAuBC,kBAAkB,KAAI;EACrB,SAAS,QAAT;EACA,eAAA;;AAzBF,4BA4BC,QAAO;EACN,yBAAA;EACA,kBAAA;EACA,MAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;;AAlCF,4BAoCC,QACC;EACC,kBAAA;EACA,gBAAA;EACA,gBAAA;;AAxCH,4BAoCC,QAMC;EACC,WAAA;EACA,WAAA;;AAIH;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AACA,mBAAE;EACD,mBAAA;;AAGF;EACC,yBAAA;EACA,gBAAA;;AAFD,uBAGC,wBACC,eACC;AALH,uBAGC,wBACC,eAEC;EACC,eAAA;;AAPJ,uBAGC,wBACC,eAKC;EACC,cAAA;;AAVJ,uBAGC,wBACC,eAQC;EACC,iBAAA;EACA,eAAA;;AAdJ,uBAGC,wBACC,eAYC;EACC,cAAA;;AAKJ;EACC,UAAA;EACA,aAAA;;AAFD,aAGC;EACC,qBAAA;EACA,cAAA;EACA,yBAAA;;AAEA,aALD,GAKG;EACD,kBAAA;;AATH,aAYC;EACC,kBAAA;;AAbF,aAeC;EACC,qBAAA;;AAhBF,aAkBC;EACC,oBAAA","sourcesContent":["@import \"vars.less\";\n\n// this sets common values for a lot of padding and margins in this file\n@common-whitespace: 1.5rem;\n\n.current-ltw-shortcode {\n\tmargin: @common-whitespace 0;\n\n\t@supports( display: grid ) {\n\t\t@media ( min-width: 771px ) {\n\t\t\tdisplay: grid;\n\t\t\tgrid-template-columns: 5fr 7fr;\n\t\t\tgrid-template-areas:\n\t\t\t\t\"search search\"\n\t\t\t\t\"list single\"\n\t\t\t;\n\t\t\tgrid-gap: @common-whitespace;\n\t\t\tgap: @common-whitespace;\n\t\t}\n\t\t.projects-search-form-search {\n\t\t\tgrid-area: search;\n\t\t}\n\t\t.projects-list {\n\t\t\tgrid-area: list;\n\t\t}\n\t\t.projects-single-layout {\n\t\t\tgrid-area: single;\n\t\t}\n\t}\n}\n\n.projects-search-form-search {\n\tpadding: @common-whitespace 0;\n\tborder-bottom: 1px solid @grey-d;\n\tinput, .btn, button, select {\n\t\tpadding: 4px;\n\t}\n\tinput, .btn, button, details, select, label {\n\t\tbox-sizing: border-box;\n\t\tline-height: 1.5;\n\t\tfont-size: 16px;\n\t\tborder-radius: 0;\n\t\theight: unset;\n\t\tmargin-top: 0;\n\t\tmargin-bottom: 0;\n\t\tdisplay: inline-block;\n\t\tvertical-align: middle;\n\t\tfloat: left;\n\t}\n\t.btn-submit {\n\t\tborder: 1px solid @grey-m;\n\t\tbackground-color: @brand;\n\t\tcolor: white;\n\t}\n\t.project-category .btn::after {\n\t\tcontent: \"\\1f893\";\n\t\tdisplay: inline;\n\t}\n\t\n\tdetails[open] {\n\t\tborder: 1px solid @grey-d;\n\t\tposition: relative;\n\t\ttop: 0;\n\t\tvertical-align: top;\n\t\tmax-height: 50vh;\n\t\toverflow: scroll;\n\t}\n\tdetails {\n\t\tli {\n\t\t\tdisplay: list-item;\n\t\t\tlist-style: none;\n\t\t\tmargin-bottom: 0;\n\t\t}\n\t\tlabel {\n\t\t\tfloat: none;\n\t\t\tclear: both;\n\t\t}\n\t}\n}\n.projects-list {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.projects-list-item {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t& + .projects-list-item {\n\t\tmargin-top: @common-whitespace * 0.5;\n\t}\n}\n.projects-single-layout {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t.projects-single-holder {\n\t\t.entry-content {\n\t\t\tiframe,\n\t\t\timg {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t\t.project-tags {\n\t\t\t\tmargin-left: 0;\n\t\t\t}\n\t\t\tlabel {\n\t\t\t\tfont-weight: bold;\n\t\t\t\tdisplay: inline;\n\t\t\t}\n\t\t\t.project-specific-link {\n\t\t\t\tdisplay: block;\n\t\t\t}\n\t\t}\n\t}\n}\n.project-tags {\n\tpadding: 0;\n\tmargin: 1em 0;\n\tli {\n\t\tdisplay: inline-block;\n\t\tpadding: 0.5em;\n\t\tborder: 1px solid @grey-d;\n\n\t\t& + li {\n\t\t\tmargin-left: 0.5em;\n\t\t}\n\t}\n\t[class*=project-status] {\n\t\tbackground: yellow;\n\t}\n\t[class*=project-org-type] {\n\t\tbackground: aliceblue;\n\t}\n\t[class*=project-category] {\n\t\tbackground: lavender;\n\t}\n}\n"]} \ No newline at end of file +{"version":3,"sources":["less/current-ltw-projects.less"],"names":[],"mappings":";;;AAKA;EACC,gBAAA;;AAEA;EACC,QAA4B;IAA5B;MACC,aAAA;MACA,8BAAA;MACA,qBACC,gBACA,aAFD;MAIA,gBAAA;MACA,WAAA;;;EATF,sBAWC;IACC,iBAAA;;EAZF,sBAcC;IACC,eAAA;;EAfF,sBAiBC;IACC,iBAAA;;;AAKH;EACC,iBAAA;EACA,gCAAA;;AAFD,4BAIC;AAJD,4BAIQ;AAJR,4BAIgB;AAJhB,4BAIwB;EACtB,yBAAA;;AALF,4BAOC;AAPD,4BAOQ;AAPR,4BAOc;AAPd,4BAOsB;EACpB,YAAA;;AARF,4BAUC;AAVD,4BAUQ;AAVR,4BAUc;AAVd,4BAUsB;AAVtB,4BAU+B;AAV/B,4BAUuC;EACrC,sBAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,aAAA;EACA,aAAA;EACA,gBAAA;EACA,qBAAA;EACA,sBAAA;EACA,WAAA;;AApBF,4BAsBC;EACC,yBAAA;EACA,YAAA;;AAxBF,4BA0BC,kBAAkB,KAAI;EACrB,SAAS,QAAT;EACA,eAAA;;AA5BF,4BA+BC,QAAO;EACN,yBAAA;EACA,kBAAA;EACA,MAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;;AArCF,4BAuCC,QACC;EACC,kBAAA;EACA,gBAAA;EACA,gBAAA;;AA3CH,4BAuCC,QAMC;EACC,WAAA;EACA,WAAA;;AAIH;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AACA,mBAAE;EACD,mBAAA;;AAGF;EACC,yBAAA;EACA,gBAAA;;AAFD,uBAGC,wBACC,eACC;AALH,uBAGC,wBACC,eAEC;EACC,eAAA;;AAPJ,uBAGC,wBACC,eAKC;EACC,cAAA;;AAVJ,uBAGC,wBACC,eAQC;EACC,iBAAA;EACA,eAAA;;AAdJ,uBAGC,wBACC,eAYC;EACC,cAAA;;AAKJ;EACC,UAAA;EACA,aAAA;;AAFD,aAGC;EACC,qBAAA;EACA,cAAA;EACA,yBAAA;;AAEA,aALD,GAKG;EACD,kBAAA;;AATH,aAYC;EACC,kBAAA;;AAbF,aAeC;EACC,qBAAA;;AAhBF,aAkBC;EACC,oBAAA","sourcesContent":["@import \"vars.less\";\n\n// this sets common values for a lot of padding and margins in this file\n@common-whitespace: 1.5rem;\n\n.current-ltw-shortcode {\n\tmargin: @common-whitespace 0;\n\n\t@supports( display: grid ) {\n\t\t@media ( min-width: 771px ) {\n\t\t\tdisplay: grid;\n\t\t\tgrid-template-columns: 5fr 7fr;\n\t\t\tgrid-template-areas:\n\t\t\t\t\"search search\"\n\t\t\t\t\"list single\"\n\t\t\t;\n\t\t\tgrid-gap: @common-whitespace;\n\t\t\tgap: @common-whitespace;\n\t\t}\n\t\t.projects-search-form-search {\n\t\t\tgrid-area: search;\n\t\t}\n\t\t.projects-list {\n\t\t\tgrid-area: list;\n\t\t}\n\t\t.projects-single-layout {\n\t\t\tgrid-area: single;\n\t\t}\n\t}\n}\n\n.projects-search-form-search {\n\tpadding: @common-whitespace 0;\n\tborder-bottom: 1px solid @grey-d;\n\n\tinput, button, select, details {\n\t\tborder: 1px solid @grey-m;\n\t}\n\tinput, .btn, button, select {\n\t\tpadding: 4px;\n\t}\n\tinput, .btn, button, details, select, label {\n\t\tbox-sizing: border-box;\n\t\tline-height: 1.5;\n\t\tfont-size: 16px;\n\t\tborder-radius: 0;\n\t\theight: unset;\n\t\tmargin-top: 0;\n\t\tmargin-bottom: 0;\n\t\tdisplay: inline-block;\n\t\tvertical-align: middle;\n\t\tfloat: left;\n\t}\n\t.btn-submit {\n\t\tbackground-color: @brand;\n\t\tcolor: white;\n\t}\n\t.project-category .btn::after {\n\t\tcontent: \"\\1f893\";\n\t\tdisplay: inline;\n\t}\n\t\n\tdetails[open] {\n\t\tborder: 1px solid @grey-d;\n\t\tposition: relative;\n\t\ttop: 0;\n\t\tvertical-align: top;\n\t\tmax-height: 50vh;\n\t\toverflow: scroll;\n\t}\n\tdetails {\n\t\tli {\n\t\t\tdisplay: list-item;\n\t\t\tlist-style: none;\n\t\t\tmargin-bottom: 0;\n\t\t}\n\t\tlabel {\n\t\t\tfloat: none;\n\t\t\tclear: both;\n\t\t}\n\t}\n}\n.projects-list {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.projects-list-item {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t& + .projects-list-item {\n\t\tmargin-top: @common-whitespace * 0.5;\n\t}\n}\n.projects-single-layout {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t.projects-single-holder {\n\t\t.entry-content {\n\t\t\tiframe,\n\t\t\timg {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t\t.project-tags {\n\t\t\t\tmargin-left: 0;\n\t\t\t}\n\t\t\tlabel {\n\t\t\t\tfont-weight: bold;\n\t\t\t\tdisplay: inline;\n\t\t\t}\n\t\t\t.project-specific-link {\n\t\t\t\tdisplay: block;\n\t\t\t}\n\t\t}\n\t}\n}\n.project-tags {\n\tpadding: 0;\n\tmargin: 1em 0;\n\tli {\n\t\tdisplay: inline-block;\n\t\tpadding: 0.5em;\n\t\tborder: 1px solid @grey-d;\n\n\t\t& + li {\n\t\t\tmargin-left: 0.5em;\n\t\t}\n\t}\n\t[class*=project-status] {\n\t\tbackground: yellow;\n\t}\n\t[class*=project-org-type] {\n\t\tbackground: aliceblue;\n\t}\n\t[class*=project-category] {\n\t\tbackground: lavender;\n\t}\n}\n"]} \ No newline at end of file diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.min.css b/wp-content/themes/currentorg/css/current-ltw-projects.min.css index 93eff1f..e3b30f6 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.min.css +++ b/wp-content/themes/currentorg/css/current-ltw-projects.min.css @@ -1 +1 @@ -.current-ltw-shortcode{margin:1.5rem 0}@supports (display:grid){@media (min-width:771px){.current-ltw-shortcode{display:grid;grid-template-columns:5fr 7fr;grid-template-areas:"search search" "list single";grid-gap:1.5rem;gap:1.5rem}}.current-ltw-shortcode .projects-search-form-search{grid-area:search}.current-ltw-shortcode .projects-list{grid-area:list}.current-ltw-shortcode .projects-single-layout{grid-area:single}}.projects-search-form-search{padding:1.5rem 0;border-bottom:1px solid #343434}.projects-search-form-search .btn,.projects-search-form-search button,.projects-search-form-search input,.projects-search-form-search select{padding:4px}.projects-search-form-search .btn,.projects-search-form-search button,.projects-search-form-search details,.projects-search-form-search input,.projects-search-form-search label,.projects-search-form-search select{box-sizing:border-box;line-height:1.5;font-size:16px;border-radius:0;height:unset;margin-top:0;margin-bottom:0;display:inline-block;vertical-align:middle;float:left}.projects-search-form-search .btn-submit{border:1px solid #666;background-color:#1c819e;color:#fff}.projects-search-form-search .project-category .btn::after{content:"\1f893";display:inline}.projects-search-form-search details[open]{border:1px solid #343434;position:relative;top:0;vertical-align:top;max-height:50vh;overflow:scroll}.projects-search-form-search details li{display:list-item;list-style:none;margin-bottom:0}.projects-search-form-search details label{float:none;clear:both}.projects-list{border:1px solid #343434;padding:.75rem}.projects-list-item{border:1px solid #343434;padding:.75rem}.projects-list-item+.projects-list-item{margin-top:.75rem}.projects-single-layout{border:1px solid #343434;padding:.75rem}.projects-single-layout .projects-single-holder .entry-content iframe,.projects-single-layout .projects-single-holder .entry-content img{max-width:100%}.projects-single-layout .projects-single-holder .entry-content .project-tags{margin-left:0}.projects-single-layout .projects-single-holder .entry-content label{font-weight:700;display:inline}.projects-single-layout .projects-single-holder .entry-content .project-specific-link{display:block}.project-tags{padding:0;margin:1em 0}.project-tags li{display:inline-block;padding:.5em;border:1px solid #343434}.project-tags li+li{margin-left:.5em}.project-tags [class*=project-status]{background:#ff0}.project-tags [class*=project-org-type]{background:#f0f8ff}.project-tags [class*=project-category]{background:#e6e6fa} \ No newline at end of file +.current-ltw-shortcode{margin:1.5rem 0}@supports (display:grid){@media (min-width:771px){.current-ltw-shortcode{display:grid;grid-template-columns:5fr 7fr;grid-template-areas:"search search" "list single";grid-gap:1.5rem;gap:1.5rem}}.current-ltw-shortcode .projects-search-form-search{grid-area:search}.current-ltw-shortcode .projects-list{grid-area:list}.current-ltw-shortcode .projects-single-layout{grid-area:single}}.projects-search-form-search{padding:1.5rem 0;border-bottom:1px solid #343434}.projects-search-form-search button,.projects-search-form-search details,.projects-search-form-search input,.projects-search-form-search select{border:1px solid #666}.projects-search-form-search .btn,.projects-search-form-search button,.projects-search-form-search input,.projects-search-form-search select{padding:4px}.projects-search-form-search .btn,.projects-search-form-search button,.projects-search-form-search details,.projects-search-form-search input,.projects-search-form-search label,.projects-search-form-search select{box-sizing:border-box;line-height:1.5;font-size:16px;border-radius:0;height:unset;margin-top:0;margin-bottom:0;display:inline-block;vertical-align:middle;float:left}.projects-search-form-search .btn-submit{background-color:#1c819e;color:#fff}.projects-search-form-search .project-category .btn::after{content:"\1f893";display:inline}.projects-search-form-search details[open]{border:1px solid #343434;position:relative;top:0;vertical-align:top;max-height:50vh;overflow:scroll}.projects-search-form-search details li{display:list-item;list-style:none;margin-bottom:0}.projects-search-form-search details label{float:none;clear:both}.projects-list{border:1px solid #343434;padding:.75rem}.projects-list-item{border:1px solid #343434;padding:.75rem}.projects-list-item+.projects-list-item{margin-top:.75rem}.projects-single-layout{border:1px solid #343434;padding:.75rem}.projects-single-layout .projects-single-holder .entry-content iframe,.projects-single-layout .projects-single-holder .entry-content img{max-width:100%}.projects-single-layout .projects-single-holder .entry-content .project-tags{margin-left:0}.projects-single-layout .projects-single-holder .entry-content label{font-weight:700;display:inline}.projects-single-layout .projects-single-holder .entry-content .project-specific-link{display:block}.project-tags{padding:0;margin:1em 0}.project-tags li{display:inline-block;padding:.5em;border:1px solid #343434}.project-tags li+li{margin-left:.5em}.project-tags [class*=project-status]{background:#ff0}.project-tags [class*=project-org-type]{background:#f0f8ff}.project-tags [class*=project-category]{background:#e6e6fa} \ No newline at end of file diff --git a/wp-content/themes/currentorg/less/current-ltw-projects.less b/wp-content/themes/currentorg/less/current-ltw-projects.less index f4444c6..aada02e 100644 --- a/wp-content/themes/currentorg/less/current-ltw-projects.less +++ b/wp-content/themes/currentorg/less/current-ltw-projects.less @@ -32,6 +32,10 @@ .projects-search-form-search { padding: @common-whitespace 0; border-bottom: 1px solid @grey-d; + + input, button, select, details { + border: 1px solid @grey-m; + } input, .btn, button, select { padding: 4px; } @@ -48,7 +52,6 @@ float: left; } .btn-submit { - border: 1px solid @grey-m; background-color: @brand; color: white; } From 15df4dad03fae70ed79019ab6095bf359c6339c1 Mon Sep 17 00:00:00 2001 From: Ben Keith Date: Tue, 2 Jun 2020 17:38:28 -0400 Subject: [PATCH 07/11] Remove search from search results when no search results are found --- wp-content/themes/currentorg/partials/projects-list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-content/themes/currentorg/partials/projects-list.php b/wp-content/themes/currentorg/partials/projects-list.php index e3dc071..32b96e7 100644 --- a/wp-content/themes/currentorg/partials/projects-list.php +++ b/wp-content/themes/currentorg/partials/projects-list.php @@ -19,7 +19,7 @@ ) ); } else { - get_template_part( 'partials/content', 'not-found' ); + echo wpautop( esc_html__( 'Apologies, but no results were found. Perhaps searching for something else will help.', 'largo' ) ); } ?> From 2e5047cd7f147c4b72c0ee787a207acb826db748 Mon Sep 17 00:00:00 2001 From: Ben Keith Date: Tue, 2 Jun 2020 18:17:20 -0400 Subject: [PATCH 08/11] Improved form appearances and remove disabling code --- .../currentorg/css/current-ltw-projects.css | 30 +++++++++++++--- .../css/current-ltw-projects.css.map | 2 +- .../css/current-ltw-projects.min.css | 2 +- .../currentorg/less/current-ltw-projects.less | 36 +++++++++++++++---- .../partials/projects-search-form.php | 13 ++++++- 5 files changed, 69 insertions(+), 14 deletions(-) diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.css b/wp-content/themes/currentorg/css/current-ltw-projects.css index 98c6f0d..326190a 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.css +++ b/wp-content/themes/currentorg/css/current-ltw-projects.css @@ -34,13 +34,13 @@ .projects-search-form-search details { border: 1px solid #666666; } -.projects-search-form-search input, +.projects-search-form-search input[type=text], .projects-search-form-search .btn, .projects-search-form-search button, .projects-search-form-search select { padding: 4px; } -.projects-search-form-search input, +.projects-search-form-search input[type=text], .projects-search-form-search .btn, .projects-search-form-search button, .projects-search-form-search details, @@ -61,9 +61,19 @@ background-color: #1c819e; color: white; } -.projects-search-form-search .project-category .btn::after { - content: "\1f893"; - display: inline; +.projects-search-form-search select#project-org-type { + -moz-appearance: none; + -webkit-appearance: none; + appearance: none; +} +.projects-search-form-search #project-org-type, +.projects-search-form-search .project-category .btn { + padding-right: 1.5em; + background-color: #eeeeee; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH5AYCFg8w3aI9vgAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAHtSURBVHja7dw5dhxBDETBBu9/56HLx2U4Sy8FZIQnOapGfsmgoW0DAAAAAAAAAAAAAAAAAAAAVlfbtt2cIdeHEwgAASAABIAAEABpPwfY/Cwgd//68gsRBP7lr2+/KYKsf/l/BCCCoPH/CkAEIePfC0AEAeP/F4AIho//SAAiGDz+owGIYOj4zwQggoHjPxuACIaN/0oAIhg0/qsBiGDI+O8EIIIB478bgAiaj79HACJoPP5eAYig6fh7BiCChuPvHYAImo1/RAAiaDT+UQGIoMn4RwYgggbjHx2ACBrsVCc8XgQLb1QnfYQIFt2nTvwYESy4TZ38USJYbJe64ONEsNAmddFHimCRPerCjxXBAlvUxR8tgot3qAU+/mb80D9cBNffvxY6xs342QEkRVAekhtBeUxuBOVBuRGUR+VGUB6WG0F5XG4E5YG5EZRH5kZQKs2NoNVNOwawcgTt7tk1gBUjaHnLzgGsFEHbO3YPYIUIWt9wQgBXRtD+flMCuCKCEbebFMCZEYy527QAzohg1M0mBnBkBOPuNTWAIyIYeavJAewZwdg7TQ9gjwhG3yghgHciGH+flABeiSDiNkkBPBNBzF3SAngkgqibJAZwL4K4e6QG8FsEybeIjsD/UQAAAAAAAAAAAAAAAEA/nwmqQUuRSMFrAAAAAElFTkSuQmCC'); + background-repeat: no-repeat; + background-position: center right 0.25em; + background-size: 1em; } .projects-search-form-search details[open] { border: 1px solid #343434; @@ -73,6 +83,12 @@ max-height: 50vh; overflow: scroll; } +.projects-search-form-search details[open] summary { + width: 100%; +} +.projects-search-form-search details ul { + clear: both; +} .projects-search-form-search details li { display: list-item; list-style: none; @@ -82,6 +98,10 @@ float: none; clear: both; } +.projects-search-form-search details input[type=checkbox] { + margin: 0; + vertical-align: initial; +} .projects-list { border: 1px solid #343434; padding: 0.75rem; diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.css.map b/wp-content/themes/currentorg/css/current-ltw-projects.css.map index 76b6440..ecb8425 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.css.map +++ b/wp-content/themes/currentorg/css/current-ltw-projects.css.map @@ -1 +1 @@ -{"version":3,"sources":["less/current-ltw-projects.less"],"names":[],"mappings":";;;AAKA;EACC,gBAAA;;AAEA;EACC,QAA4B;IAA5B;MACC,aAAA;MACA,8BAAA;MACA,qBACC,gBACA,aAFD;MAIA,gBAAA;MACA,WAAA;;;EATF,sBAWC;IACC,iBAAA;;EAZF,sBAcC;IACC,eAAA;;EAfF,sBAiBC;IACC,iBAAA;;;AAKH;EACC,iBAAA;EACA,gCAAA;;AAFD,4BAIC;AAJD,4BAIQ;AAJR,4BAIgB;AAJhB,4BAIwB;EACtB,yBAAA;;AALF,4BAOC;AAPD,4BAOQ;AAPR,4BAOc;AAPd,4BAOsB;EACpB,YAAA;;AARF,4BAUC;AAVD,4BAUQ;AAVR,4BAUc;AAVd,4BAUsB;AAVtB,4BAU+B;AAV/B,4BAUuC;EACrC,sBAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,aAAA;EACA,aAAA;EACA,gBAAA;EACA,qBAAA;EACA,sBAAA;EACA,WAAA;;AApBF,4BAsBC;EACC,yBAAA;EACA,YAAA;;AAxBF,4BA0BC,kBAAkB,KAAI;EACrB,SAAS,QAAT;EACA,eAAA;;AA5BF,4BA+BC,QAAO;EACN,yBAAA;EACA,kBAAA;EACA,MAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;;AArCF,4BAuCC,QACC;EACC,kBAAA;EACA,gBAAA;EACA,gBAAA;;AA3CH,4BAuCC,QAMC;EACC,WAAA;EACA,WAAA;;AAIH;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AACA,mBAAE;EACD,mBAAA;;AAGF;EACC,yBAAA;EACA,gBAAA;;AAFD,uBAGC,wBACC,eACC;AALH,uBAGC,wBACC,eAEC;EACC,eAAA;;AAPJ,uBAGC,wBACC,eAKC;EACC,cAAA;;AAVJ,uBAGC,wBACC,eAQC;EACC,iBAAA;EACA,eAAA;;AAdJ,uBAGC,wBACC,eAYC;EACC,cAAA;;AAKJ;EACC,UAAA;EACA,aAAA;;AAFD,aAGC;EACC,qBAAA;EACA,cAAA;EACA,yBAAA;;AAEA,aALD,GAKG;EACD,kBAAA;;AATH,aAYC;EACC,kBAAA;;AAbF,aAeC;EACC,qBAAA;;AAhBF,aAkBC;EACC,oBAAA","sourcesContent":["@import \"vars.less\";\n\n// this sets common values for a lot of padding and margins in this file\n@common-whitespace: 1.5rem;\n\n.current-ltw-shortcode {\n\tmargin: @common-whitespace 0;\n\n\t@supports( display: grid ) {\n\t\t@media ( min-width: 771px ) {\n\t\t\tdisplay: grid;\n\t\t\tgrid-template-columns: 5fr 7fr;\n\t\t\tgrid-template-areas:\n\t\t\t\t\"search search\"\n\t\t\t\t\"list single\"\n\t\t\t;\n\t\t\tgrid-gap: @common-whitespace;\n\t\t\tgap: @common-whitespace;\n\t\t}\n\t\t.projects-search-form-search {\n\t\t\tgrid-area: search;\n\t\t}\n\t\t.projects-list {\n\t\t\tgrid-area: list;\n\t\t}\n\t\t.projects-single-layout {\n\t\t\tgrid-area: single;\n\t\t}\n\t}\n}\n\n.projects-search-form-search {\n\tpadding: @common-whitespace 0;\n\tborder-bottom: 1px solid @grey-d;\n\n\tinput, button, select, details {\n\t\tborder: 1px solid @grey-m;\n\t}\n\tinput, .btn, button, select {\n\t\tpadding: 4px;\n\t}\n\tinput, .btn, button, details, select, label {\n\t\tbox-sizing: border-box;\n\t\tline-height: 1.5;\n\t\tfont-size: 16px;\n\t\tborder-radius: 0;\n\t\theight: unset;\n\t\tmargin-top: 0;\n\t\tmargin-bottom: 0;\n\t\tdisplay: inline-block;\n\t\tvertical-align: middle;\n\t\tfloat: left;\n\t}\n\t.btn-submit {\n\t\tbackground-color: @brand;\n\t\tcolor: white;\n\t}\n\t.project-category .btn::after {\n\t\tcontent: \"\\1f893\";\n\t\tdisplay: inline;\n\t}\n\t\n\tdetails[open] {\n\t\tborder: 1px solid @grey-d;\n\t\tposition: relative;\n\t\ttop: 0;\n\t\tvertical-align: top;\n\t\tmax-height: 50vh;\n\t\toverflow: scroll;\n\t}\n\tdetails {\n\t\tli {\n\t\t\tdisplay: list-item;\n\t\t\tlist-style: none;\n\t\t\tmargin-bottom: 0;\n\t\t}\n\t\tlabel {\n\t\t\tfloat: none;\n\t\t\tclear: both;\n\t\t}\n\t}\n}\n.projects-list {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.projects-list-item {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t& + .projects-list-item {\n\t\tmargin-top: @common-whitespace * 0.5;\n\t}\n}\n.projects-single-layout {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t.projects-single-holder {\n\t\t.entry-content {\n\t\t\tiframe,\n\t\t\timg {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t\t.project-tags {\n\t\t\t\tmargin-left: 0;\n\t\t\t}\n\t\t\tlabel {\n\t\t\t\tfont-weight: bold;\n\t\t\t\tdisplay: inline;\n\t\t\t}\n\t\t\t.project-specific-link {\n\t\t\t\tdisplay: block;\n\t\t\t}\n\t\t}\n\t}\n}\n.project-tags {\n\tpadding: 0;\n\tmargin: 1em 0;\n\tli {\n\t\tdisplay: inline-block;\n\t\tpadding: 0.5em;\n\t\tborder: 1px solid @grey-d;\n\n\t\t& + li {\n\t\t\tmargin-left: 0.5em;\n\t\t}\n\t}\n\t[class*=project-status] {\n\t\tbackground: yellow;\n\t}\n\t[class*=project-org-type] {\n\t\tbackground: aliceblue;\n\t}\n\t[class*=project-category] {\n\t\tbackground: lavender;\n\t}\n}\n"]} \ No newline at end of file +{"version":3,"sources":["less/current-ltw-projects.less"],"names":[],"mappings":";;;AAKA;EACC,gBAAA;;AAEA;EACC,QAA4B;IAA5B;MACC,aAAA;MACA,8BAAA;MACA,qBACC,gBACA,aAFD;MAIA,gBAAA;MACA,WAAA;;;EATF,sBAWC;IACC,iBAAA;;EAZF,sBAcC;IACC,eAAA;;EAfF,sBAiBC;IACC,iBAAA;;;AAKH;EACC,iBAAA;EACA,gCAAA;;AAFD,4BAIC;AAJD,4BAIQ;AAJR,4BAIgB;AAJhB,4BAIwB;EACtB,yBAAA;;AALF,4BAOC,MAAK;AAPN,4BAOmB;AAPnB,4BAOyB;AAPzB,4BAOiC;EAC/B,YAAA;;AARF,4BAUC,MAAK;AAVN,4BAUmB;AAVnB,4BAUyB;AAVzB,4BAUiC;AAVjC,4BAU0C;AAV1C,4BAUkD;EAChD,sBAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,aAAA;EACA,aAAA;EACA,gBAAA;EACA,qBAAA;EACA,sBAAA;EACA,WAAA;;AApBF,4BAsBC;EACC,yBAAA;EACA,YAAA;;AAxBF,4BA2BC,OAAM;EAEL,qBAAA;EACA,wBAAA;EACA,gBAAA;;AA/BF,4BAkCC;AAlCD,4BAmCC,kBAAkB;EAEjB,oBAAA;EACA,yBAAA;EACA,sBAAsB,q3BAAtB;EACA,4BAAA;EACA,wCAAA;EACA,oBAAA;;AA1CF,4BA6CC,QAAO;EACN,yBAAA;EACA,kBAAA;EACA,MAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;;AAnDF,4BA6CC,QAAO,MAON;EACC,WAAA;;AArDH,4BAwDC,QACC;EACC,WAAA;;AA1DH,4BAwDC,QAIC;EACC,kBAAA;EACA,gBAAA;EACA,gBAAA;;AA/DH,4BAwDC,QASC;EACC,WAAA;EACA,WAAA;;AAnEH,4BAwDC,QAaC,MAAK;EACJ,SAAA;EACA,uBAAA;;AAIH;EACC,yBAAA;EACA,gBAAA;;AAED;EACC,yBAAA;EACA,gBAAA;;AACA,mBAAE;EACD,mBAAA;;AAGF;EACC,yBAAA;EACA,gBAAA;;AAFD,uBAGC,wBACC,eACC;AALH,uBAGC,wBACC,eAEC;EACC,eAAA;;AAPJ,uBAGC,wBACC,eAKC;EACC,cAAA;;AAVJ,uBAGC,wBACC,eAQC;EACC,iBAAA;EACA,eAAA;;AAdJ,uBAGC,wBACC,eAYC;EACC,cAAA;;AAKJ;EACC,UAAA;EACA,aAAA;;AAFD,aAGC;EACC,qBAAA;EACA,cAAA;EACA,yBAAA;;AAEA,aALD,GAKG;EACD,kBAAA;;AATH,aAYC;EACC,kBAAA;;AAbF,aAeC;EACC,qBAAA;;AAhBF,aAkBC;EACC,oBAAA","sourcesContent":["@import \"vars.less\";\n\n// this sets common values for a lot of padding and margins in this file\n@common-whitespace: 1.5rem;\n\n.current-ltw-shortcode {\n\tmargin: @common-whitespace 0;\n\n\t@supports( display: grid ) {\n\t\t@media ( min-width: 771px ) {\n\t\t\tdisplay: grid;\n\t\t\tgrid-template-columns: 5fr 7fr;\n\t\t\tgrid-template-areas:\n\t\t\t\t\"search search\"\n\t\t\t\t\"list single\"\n\t\t\t;\n\t\t\tgrid-gap: @common-whitespace;\n\t\t\tgap: @common-whitespace;\n\t\t}\n\t\t.projects-search-form-search {\n\t\t\tgrid-area: search;\n\t\t}\n\t\t.projects-list {\n\t\t\tgrid-area: list;\n\t\t}\n\t\t.projects-single-layout {\n\t\t\tgrid-area: single;\n\t\t}\n\t}\n}\n\n.projects-search-form-search {\n\tpadding: @common-whitespace 0;\n\tborder-bottom: 1px solid @grey-d;\n\n\tinput, button, select, details {\n\t\tborder: 1px solid @grey-m;\n\t}\n\tinput[type=text], .btn, button, select {\n\t\tpadding: 4px;\n\t}\n\tinput[type=text], .btn, button, details, select, label {\n\t\tbox-sizing: border-box;\n\t\tline-height: 1.5;\n\t\tfont-size: 16px;\n\t\tborder-radius: 0;\n\t\theight: unset;\n\t\tmargin-top: 0;\n\t\tmargin-bottom: 0;\n\t\tdisplay: inline-block;\n\t\tvertical-align: middle;\n\t\tfloat: left;\n\t}\n\t.btn-submit {\n\t\tbackground-color: @brand;\n\t\tcolor: white;\n\t}\n\n\tselect#project-org-type {\n\t\t// https://www.filamentgroup.com/lab/select-css.html\n\t\t-moz-appearance: none;\n\t\t-webkit-appearance: none;\n\t\tappearance: none;\n\t}\n\n\t#project-org-type,\n\t.project-category .btn {\n\t\t// https://www.filamentgroup.com/lab/select-css.html\n\t\tpadding-right: 1.5em;\n\t\tbackground-color: @grey-l;\n\t\tbackground-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH5AYCFg8w3aI9vgAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAHtSURBVHja7dw5dhxBDETBBu9/56HLx2U4Sy8FZIQnOapGfsmgoW0DAAAAAAAAAAAAAAAAAAAAVlfbtt2cIdeHEwgAASAABIAAEABpPwfY/Cwgd//68gsRBP7lr2+/KYKsf/l/BCCCoPH/CkAEIePfC0AEAeP/F4AIho//SAAiGDz+owGIYOj4zwQggoHjPxuACIaN/0oAIhg0/qsBiGDI+O8EIIIB478bgAiaj79HACJoPP5eAYig6fh7BiCChuPvHYAImo1/RAAiaDT+UQGIoMn4RwYgggbjHx2ACBrsVCc8XgQLb1QnfYQIFt2nTvwYESy4TZ38USJYbJe64ONEsNAmddFHimCRPerCjxXBAlvUxR8tgot3qAU+/mb80D9cBNffvxY6xs342QEkRVAekhtBeUxuBOVBuRGUR+VGUB6WG0F5XG4E5YG5EZRH5kZQKs2NoNVNOwawcgTt7tk1gBUjaHnLzgGsFEHbO3YPYIUIWt9wQgBXRtD+flMCuCKCEbebFMCZEYy527QAzohg1M0mBnBkBOPuNTWAIyIYeavJAewZwdg7TQ9gjwhG3yghgHciGH+flABeiSDiNkkBPBNBzF3SAngkgqibJAZwL4K4e6QG8FsEybeIjsD/UQAAAAAAAAAAAAAAAEA/nwmqQUuRSMFrAAAAAElFTkSuQmCC');\n\t\tbackground-repeat: no-repeat;\n\t\tbackground-position: center right 0.25em;\n\t\tbackground-size: 1em;\n\t}\n\n\tdetails[open] {\n\t\tborder: 1px solid @grey-d;\n\t\tposition: relative;\n\t\ttop: 0;\n\t\tvertical-align: top;\n\t\tmax-height: 50vh;\n\t\toverflow: scroll;\n\t\tsummary {\n\t\t\twidth: 100%;\n\t\t}\n\t}\n\tdetails {\n\t\tul {\n\t\t\tclear: both;\n\t\t}\n\t\tli {\n\t\t\tdisplay: list-item;\n\t\t\tlist-style: none;\n\t\t\tmargin-bottom: 0;\n\t\t}\n\t\tlabel {\n\t\t\tfloat: none;\n\t\t\tclear: both;\n\t\t}\n\t\tinput[type=checkbox] {\n\t\t\tmargin: 0;\n\t\t\tvertical-align: initial;\n\t\t}\n\t}\n}\n.projects-list {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n}\n.projects-list-item {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t& + .projects-list-item {\n\t\tmargin-top: @common-whitespace * 0.5;\n\t}\n}\n.projects-single-layout {\n\tborder: 1px solid @grey-d;\n\tpadding: @common-whitespace * 0.5;\n\t.projects-single-holder {\n\t\t.entry-content {\n\t\t\tiframe,\n\t\t\timg {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t\t.project-tags {\n\t\t\t\tmargin-left: 0;\n\t\t\t}\n\t\t\tlabel {\n\t\t\t\tfont-weight: bold;\n\t\t\t\tdisplay: inline;\n\t\t\t}\n\t\t\t.project-specific-link {\n\t\t\t\tdisplay: block;\n\t\t\t}\n\t\t}\n\t}\n}\n.project-tags {\n\tpadding: 0;\n\tmargin: 1em 0;\n\tli {\n\t\tdisplay: inline-block;\n\t\tpadding: 0.5em;\n\t\tborder: 1px solid @grey-d;\n\n\t\t& + li {\n\t\t\tmargin-left: 0.5em;\n\t\t}\n\t}\n\t[class*=project-status] {\n\t\tbackground: yellow;\n\t}\n\t[class*=project-org-type] {\n\t\tbackground: aliceblue;\n\t}\n\t[class*=project-category] {\n\t\tbackground: lavender;\n\t}\n}\n"]} \ No newline at end of file diff --git a/wp-content/themes/currentorg/css/current-ltw-projects.min.css b/wp-content/themes/currentorg/css/current-ltw-projects.min.css index e3b30f6..5c1228b 100644 --- a/wp-content/themes/currentorg/css/current-ltw-projects.min.css +++ b/wp-content/themes/currentorg/css/current-ltw-projects.min.css @@ -1 +1 @@ -.current-ltw-shortcode{margin:1.5rem 0}@supports (display:grid){@media (min-width:771px){.current-ltw-shortcode{display:grid;grid-template-columns:5fr 7fr;grid-template-areas:"search search" "list single";grid-gap:1.5rem;gap:1.5rem}}.current-ltw-shortcode .projects-search-form-search{grid-area:search}.current-ltw-shortcode .projects-list{grid-area:list}.current-ltw-shortcode .projects-single-layout{grid-area:single}}.projects-search-form-search{padding:1.5rem 0;border-bottom:1px solid #343434}.projects-search-form-search button,.projects-search-form-search details,.projects-search-form-search input,.projects-search-form-search select{border:1px solid #666}.projects-search-form-search .btn,.projects-search-form-search button,.projects-search-form-search input,.projects-search-form-search select{padding:4px}.projects-search-form-search .btn,.projects-search-form-search button,.projects-search-form-search details,.projects-search-form-search input,.projects-search-form-search label,.projects-search-form-search select{box-sizing:border-box;line-height:1.5;font-size:16px;border-radius:0;height:unset;margin-top:0;margin-bottom:0;display:inline-block;vertical-align:middle;float:left}.projects-search-form-search .btn-submit{background-color:#1c819e;color:#fff}.projects-search-form-search .project-category .btn::after{content:"\1f893";display:inline}.projects-search-form-search details[open]{border:1px solid #343434;position:relative;top:0;vertical-align:top;max-height:50vh;overflow:scroll}.projects-search-form-search details li{display:list-item;list-style:none;margin-bottom:0}.projects-search-form-search details label{float:none;clear:both}.projects-list{border:1px solid #343434;padding:.75rem}.projects-list-item{border:1px solid #343434;padding:.75rem}.projects-list-item+.projects-list-item{margin-top:.75rem}.projects-single-layout{border:1px solid #343434;padding:.75rem}.projects-single-layout .projects-single-holder .entry-content iframe,.projects-single-layout .projects-single-holder .entry-content img{max-width:100%}.projects-single-layout .projects-single-holder .entry-content .project-tags{margin-left:0}.projects-single-layout .projects-single-holder .entry-content label{font-weight:700;display:inline}.projects-single-layout .projects-single-holder .entry-content .project-specific-link{display:block}.project-tags{padding:0;margin:1em 0}.project-tags li{display:inline-block;padding:.5em;border:1px solid #343434}.project-tags li+li{margin-left:.5em}.project-tags [class*=project-status]{background:#ff0}.project-tags [class*=project-org-type]{background:#f0f8ff}.project-tags [class*=project-category]{background:#e6e6fa} \ No newline at end of file +.current-ltw-shortcode{margin:1.5rem 0}@supports (display:grid){@media (min-width:771px){.current-ltw-shortcode{display:grid;grid-template-columns:5fr 7fr;grid-template-areas:"search search" "list single";grid-gap:1.5rem;gap:1.5rem}}.current-ltw-shortcode .projects-search-form-search{grid-area:search}.current-ltw-shortcode .projects-list{grid-area:list}.current-ltw-shortcode .projects-single-layout{grid-area:single}}.projects-search-form-search{padding:1.5rem 0;border-bottom:1px solid #343434}.projects-search-form-search button,.projects-search-form-search details,.projects-search-form-search input,.projects-search-form-search select{border:1px solid #666}.projects-search-form-search .btn,.projects-search-form-search button,.projects-search-form-search input[type=text],.projects-search-form-search select{padding:4px}.projects-search-form-search .btn,.projects-search-form-search button,.projects-search-form-search details,.projects-search-form-search input[type=text],.projects-search-form-search label,.projects-search-form-search select{box-sizing:border-box;line-height:1.5;font-size:16px;border-radius:0;height:unset;margin-top:0;margin-bottom:0;display:inline-block;vertical-align:middle;float:left}.projects-search-form-search .btn-submit{background-color:#1c819e;color:#fff}.projects-search-form-search select#project-org-type{-moz-appearance:none;-webkit-appearance:none;appearance:none}.projects-search-form-search #project-org-type,.projects-search-form-search .project-category .btn{padding-right:1.5em;background-color:#eee;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH5AYCFg8w3aI9vgAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAHtSURBVHja7dw5dhxBDETBBu9/56HLx2U4Sy8FZIQnOapGfsmgoW0DAAAAAAAAAAAAAAAAAAAAVlfbtt2cIdeHEwgAASAABIAAEABpPwfY/Cwgd//68gsRBP7lr2+/KYKsf/l/BCCCoPH/CkAEIePfC0AEAeP/F4AIho//SAAiGDz+owGIYOj4zwQggoHjPxuACIaN/0oAIhg0/qsBiGDI+O8EIIIB478bgAiaj79HACJoPP5eAYig6fh7BiCChuPvHYAImo1/RAAiaDT+UQGIoMn4RwYgggbjHx2ACBrsVCc8XgQLb1QnfYQIFt2nTvwYESy4TZ38USJYbJe64ONEsNAmddFHimCRPerCjxXBAlvUxR8tgot3qAU+/mb80D9cBNffvxY6xs342QEkRVAekhtBeUxuBOVBuRGUR+VGUB6WG0F5XG4E5YG5EZRH5kZQKs2NoNVNOwawcgTt7tk1gBUjaHnLzgGsFEHbO3YPYIUIWt9wQgBXRtD+flMCuCKCEbebFMCZEYy527QAzohg1M0mBnBkBOPuNTWAIyIYeavJAewZwdg7TQ9gjwhG3yghgHciGH+flABeiSDiNkkBPBNBzF3SAngkgqibJAZwL4K4e6QG8FsEybeIjsD/UQAAAAAAAAAAAAAAAEA/nwmqQUuRSMFrAAAAAElFTkSuQmCC);background-repeat:no-repeat;background-position:center right .25em;background-size:1em}.projects-search-form-search details[open]{border:1px solid #343434;position:relative;top:0;vertical-align:top;max-height:50vh;overflow:scroll}.projects-search-form-search details[open] summary{width:100%}.projects-search-form-search details ul{clear:both}.projects-search-form-search details li{display:list-item;list-style:none;margin-bottom:0}.projects-search-form-search details label{float:none;clear:both}.projects-search-form-search details input[type=checkbox]{margin:0;vertical-align:initial}.projects-list{border:1px solid #343434;padding:.75rem}.projects-list-item{border:1px solid #343434;padding:.75rem}.projects-list-item+.projects-list-item{margin-top:.75rem}.projects-single-layout{border:1px solid #343434;padding:.75rem}.projects-single-layout .projects-single-holder .entry-content iframe,.projects-single-layout .projects-single-holder .entry-content img{max-width:100%}.projects-single-layout .projects-single-holder .entry-content .project-tags{margin-left:0}.projects-single-layout .projects-single-holder .entry-content label{font-weight:700;display:inline}.projects-single-layout .projects-single-holder .entry-content .project-specific-link{display:block}.project-tags{padding:0;margin:1em 0}.project-tags li{display:inline-block;padding:.5em;border:1px solid #343434}.project-tags li+li{margin-left:.5em}.project-tags [class*=project-status]{background:#ff0}.project-tags [class*=project-org-type]{background:#f0f8ff}.project-tags [class*=project-category]{background:#e6e6fa} \ No newline at end of file diff --git a/wp-content/themes/currentorg/less/current-ltw-projects.less b/wp-content/themes/currentorg/less/current-ltw-projects.less index aada02e..7e6a3d3 100644 --- a/wp-content/themes/currentorg/less/current-ltw-projects.less +++ b/wp-content/themes/currentorg/less/current-ltw-projects.less @@ -36,10 +36,10 @@ input, button, select, details { border: 1px solid @grey-m; } - input, .btn, button, select { + input[type=text], .btn, button, select { padding: 4px; } - input, .btn, button, details, select, label { + input[type=text], .btn, button, details, select, label { box-sizing: border-box; line-height: 1.5; font-size: 16px; @@ -55,11 +55,25 @@ background-color: @brand; color: white; } - .project-category .btn::after { - content: "\1f893"; - display: inline; + + select#project-org-type { + // https://www.filamentgroup.com/lab/select-css.html + -moz-appearance: none; + -webkit-appearance: none; + appearance: none; + } + + #project-org-type, + .project-category .btn { + // https://www.filamentgroup.com/lab/select-css.html + padding-right: 1.5em; + background-color: @grey-l; + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH5AYCFg8w3aI9vgAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAHtSURBVHja7dw5dhxBDETBBu9/56HLx2U4Sy8FZIQnOapGfsmgoW0DAAAAAAAAAAAAAAAAAAAAVlfbtt2cIdeHEwgAASAABIAAEABpPwfY/Cwgd//68gsRBP7lr2+/KYKsf/l/BCCCoPH/CkAEIePfC0AEAeP/F4AIho//SAAiGDz+owGIYOj4zwQggoHjPxuACIaN/0oAIhg0/qsBiGDI+O8EIIIB478bgAiaj79HACJoPP5eAYig6fh7BiCChuPvHYAImo1/RAAiaDT+UQGIoMn4RwYgggbjHx2ACBrsVCc8XgQLb1QnfYQIFt2nTvwYESy4TZ38USJYbJe64ONEsNAmddFHimCRPerCjxXBAlvUxR8tgot3qAU+/mb80D9cBNffvxY6xs342QEkRVAekhtBeUxuBOVBuRGUR+VGUB6WG0F5XG4E5YG5EZRH5kZQKs2NoNVNOwawcgTt7tk1gBUjaHnLzgGsFEHbO3YPYIUIWt9wQgBXRtD+flMCuCKCEbebFMCZEYy527QAzohg1M0mBnBkBOPuNTWAIyIYeavJAewZwdg7TQ9gjwhG3yghgHciGH+flABeiSDiNkkBPBNBzF3SAngkgqibJAZwL4K4e6QG8FsEybeIjsD/UQAAAAAAAAAAAAAAAEA/nwmqQUuRSMFrAAAAAElFTkSuQmCC'); + background-repeat: no-repeat; + background-position: center right 0.25em; + background-size: 1em; } - + details[open] { border: 1px solid @grey-d; position: relative; @@ -67,8 +81,14 @@ vertical-align: top; max-height: 50vh; overflow: scroll; + summary { + width: 100%; + } } details { + ul { + clear: both; + } li { display: list-item; list-style: none; @@ -78,6 +98,10 @@ float: none; clear: both; } + input[type=checkbox] { + margin: 0; + vertical-align: initial; + } } } .projects-list { diff --git a/wp-content/themes/currentorg/partials/projects-search-form.php b/wp-content/themes/currentorg/partials/projects-search-form.php index 583e8bd..2ca2d9e 100644 --- a/wp-content/themes/currentorg/partials/projects-search-form.php +++ b/wp-content/themes/currentorg/partials/projects-search-form.php @@ -51,10 +51,21 @@ '%1$s', __( 'Categories', 'currentorg' ) ); - wp_terms_checklist( null, array( + + echo '
    '; + // because whether an input is disabled is based on the present $post, + // but we're using it outside that context + $checklist = wp_terms_checklist( null, array( 'taxonomy' => 'project-category', 'selected_cats' => ( isset( $_GET['tax_input']['project-category'] ) && is_array( $_GET['tax_input']['project-category'] ) ) ? $_GET['tax_input']['project-category'] : '' , + 'echo' => false, ) ); + echo str_replace( + disabled( false, false, false ), + '', + $checklist + ); + echo '
'; ?> From b015ddc79814fb0a5cb7f58e3dc286e3bfbf2c8e Mon Sep 17 00:00:00 2001 From: Ben Keith Date: Wed, 3 Jun 2020 13:37:26 -0400 Subject: [PATCH 09/11] Resolve https://github.com/INN/umbrella-currentorg/pull/138#discussion_r434725123 --- .../themes/currentorg/partials/content-projects-list-item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-content/themes/currentorg/partials/content-projects-list-item.php b/wp-content/themes/currentorg/partials/content-projects-list-item.php index c1ac8f3..8370743 100644 --- a/wp-content/themes/currentorg/partials/content-projects-list-item.php +++ b/wp-content/themes/currentorg/partials/content-projects-list-item.php @@ -66,7 +66,7 @@ esc_attr( $term->taxonomy ), esc_attr( $term->slug ), // @todo: make this be a link that triggers the search filter for this term - esc_attr( '?' . $term->taxonomy . '=' . $term->term_id ), + esc_attr( '?tax_input[' . $term->taxonomy . '][]=' . $term->term_id ), esc_html( $term->name ) ); } From 725111f5c81e67ff81e5f81da27f1d595088f833 Mon Sep 17 00:00:00 2001 From: Ben Keith Date: Wed, 3 Jun 2020 14:06:28 -0400 Subject: [PATCH 10/11] Change URL param for project-org-type search to match param used for other project taxonomies, for simpler generation of tag links. --- .../currentorg/partials/projects-base.php | 22 ++++++++-------- .../partials/projects-search-form.php | 25 ++++++++++++++----- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/wp-content/themes/currentorg/partials/projects-base.php b/wp-content/themes/currentorg/partials/projects-base.php index da1a003..473da5d 100644 --- a/wp-content/themes/currentorg/partials/projects-base.php +++ b/wp-content/themes/currentorg/partials/projects-base.php @@ -15,18 +15,20 @@ } $tax_query = array(); -if ( isset( $_GET['project-org-type'] ) && ! empty( $_GET['project-org-type'] ) ) { - $term = sanitize_title_for_query( $_GET['project-org-type'] ); - if ( ! empty( $term ) && is_numeric( $term ) ) { - $tax_query[] = array( - 'taxonomy' => 'project-org-type', - 'terms' => $term, - 'field' => 'term_id', - ); +if ( isset( $_GET['tax_input']['project-org-type'] ) && is_array( $_GET['tax_input']['project-org-type'] ) ) { + foreach( $_GET['tax_input']['project-org-type'] as $term ) { + $term = sanitize_title_for_query( $term ); + if ( ! empty( $term ) && is_numeric( $term ) ) { + $tax_query[] = array( + 'taxonomy' => 'project-org-type', + 'field' => 'term_id', + 'terms' => $term, + ); + } + unset( $term ); } - unset( $term ); } -if ( isset( $_GET['tax_input']['project-category'] ) && is_array( $_GET['tax_input']['project-category'] ) ) { +if ( isset( $_GET['tax_input']['project-org-type'] ) && is_array( $_GET['tax_input']['project-category'] ) ) { foreach( $_GET['tax_input']['project-category'] as $term ) { $term = sanitize_title_for_query( $term ); if ( ! empty( $term ) && is_numeric( $term ) ) { diff --git a/wp-content/themes/currentorg/partials/projects-search-form.php b/wp-content/themes/currentorg/partials/projects-search-form.php index 2ca2d9e..549f8a7 100644 --- a/wp-content/themes/currentorg/partials/projects-search-form.php +++ b/wp-content/themes/currentorg/partials/projects-search-form.php @@ -29,18 +29,30 @@ -