Merge pull request #152 from CityOfNewYork/feedback-and-services-cata…

…logue-cms-able

Tasks #21 and #97

wp-content/themes/workingnyc/acf-json/group_5f85f88f37a35.json

@@ -235,6 +235,23 @@
             "prepend": "",
             "append": "",
             "maxlength": ""
+        },
+        {
+            "key": "field_65d8dcf16903e",
+            "label": "Feedback form link",
+            "name": "feedback_form_link",
+            "type": "url",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "relevanssi_exclude": 0,
+            "default_value": "",
+            "placeholder": ""
         }
     ],
     "location": [
@@ -260,5 +277,5 @@
     "active": true,
     "description": "",
     "show_in_rest": 0,
-    "modified": 1706805507
+    "modified": 1708711168
 }

wp-content/themes/workingnyc/assets/js/archive-employer-programs-b8a2271.js → wp-content/themes/workingnyc/assets/js/archive-employer-programs-d28796f.js

@@ -1165,7 +1165,7 @@
 	const __vue_script__$1 = EmployerProgramsArchive;
 
 	/* template */
-	var __vue_render__$1 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('div',{staticClass:"layout-content bg-scale-3"},[_c('div',{staticClass:"page-max"},[_c('header',{staticClass:"o-header"},[_c('div',[_c('nav',{staticClass:"o-header__breadcrumbs",attrs:{"aria-label":"Breadcrumb"}},[_c('a',{attrs:{"href":_vm.strings.HOME_LINK}},[_vm._v(_vm._s(_vm.strings.HOME))])]),_vm._v(" "),_c('div',{staticClass:"o-header__title"},[_c('h1',{staticClass:"o-header__heading",attrs:{"id":"page-heading"}},[_vm._v(_vm._s(_vm.strings.PAGE_TITLE))])]),_vm._v(" "),_c('div',{staticClass:"mb-2"},[_c('p',[_vm._v(_vm._s(_vm.strings.PAGE_SUBTITLE))])])])])])]),_vm._v(" "),_c('div',{staticClass:"page-max mx-auto"},[_c('div',{staticClass:"desktop:flex desktop:justify-center"},[(!_vm.filtersExpanded)?_c('div',{class:'desktop:w-4/5 py-2 px-2 desktop:pt-7 desktop:px-0 tablet:px-7 flex flex-wrap gap-y-2 justify-start items-center shadow-[2px_2px_30px_0_#EFF1F5] desktop:shadow-none ' 
+	var __vue_render__$1 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('div',{staticClass:"layout-content bg-[#EEF4FF]"},[_c('div',{staticClass:"page-max"},[_c('header',{staticClass:"o-header"},[_c('div',[_c('nav',{staticClass:"o-header__breadcrumbs",attrs:{"aria-label":"Breadcrumb"}},[_c('a',{attrs:{"href":_vm.strings.HOME_LINK}},[_vm._v(_vm._s(_vm.strings.HOME))])]),_vm._v(" "),_c('div',{staticClass:"o-header__title"},[_c('h1',{staticClass:"o-header__heading",attrs:{"id":"page-heading"}},[_vm._v(_vm._s(_vm.strings.PAGE_TITLE))])]),_vm._v(" "),_c('div',{staticClass:"mb-2"},[_c('p',[_vm._v(_vm._s(_vm.strings.PAGE_SUBTITLE))])])])])])]),_vm._v(" "),_c('div',{staticClass:"page-max mx-auto"},[_c('div',{staticClass:"desktop:flex desktop:justify-center"},[(!_vm.filtersExpanded)?_c('div',{class:'desktop:w-4/5 py-2 px-2 desktop:pt-7 desktop:px-0 tablet:px-7 flex flex-wrap gap-y-2 justify-start items-center shadow-[2px_2px_30px_0_#EFF1F5] desktop:shadow-none ' 
 	        + (_vm.termsChecked ? 'desktop:pb-5' : 'desktop:pb-0')},[_c('div',{staticClass:"desktop:hidden pr-2"},[_c('button',{staticClass:"btn btn-small btn-secondary bg-white text-[#30374F] border-[#30374F]",attrs:{"disabled":_vm.terms.length === 0},on:{"click":function($event){_vm.filtersExpanded = true;}}},[_c('span',{staticClass:"mie-1"},[_vm._v(_vm._s(_vm.strings.FILTERS))]),_vm._v(" "),_c('span',{staticClass:"badge badge-small bg-[#30374F] text-white font-normal"},[_vm._v(_vm._s(_vm.totalFilters))])])]),_vm._v(" "),(_vm.termsChecked)?_c('div',{staticClass:"hidden desktop:flex pr-2"},[_vm._v("Active filters")]):_vm._e(),_vm._v(" "),_vm._l((_vm.terms),function(term){return [_vm._l((term.filters),function(filter){return [(filter.checked)?_c('div',{staticClass:"small rounded p-1 bg-scale-2 mr-1 flex"},[_c('span',{staticClass:"text-nowrap"},[_vm._v(_vm._s(filter.name))]),_vm._v(" "),_c('button',{on:{"click":function($event){return _vm.click({event: $event, data: filter})}}},[_c('svg',{staticClass:"icon-ui stroke-black",attrs:{"aria-hidden":"true","tabindex":"-1"}},[_c('use',{attrs:{"href":"#lucide-x"}})])])]):_vm._e()]})]}),_vm._v(" "),(_vm.termsChecked)?_c('button',{staticClass:"hidden desktop:flex small text-black no-underline",on:{"click":_vm.reset}},[_vm._v(_vm._s(_vm.strings.RESET))]):_vm._e()],2):_c('div',{staticClass:"py-5 tablet:py-6 px-2 tablet:px-7"},[_c('div',[_c('h6',{staticClass:"mb-3"},[_vm._v("\n            "+_vm._s(_vm.strings.FILTER_BY)+"\n          ")]),_vm._v(" "),_vm._l((_vm.terms),function(term,index){return _c('div',{key:term.slug},[_c('fieldset',{staticClass:"fieldset mb-3",attrs:{"tabindex":"-1"}},[_c('div',{staticClass:"border-b border-scale-3 flex",on:{"click":function($event){return _vm.toggleAccordion(index)}}},[_c('legend',{staticClass:"h6 mb-2"},[_vm._v("\n                    "+_vm._s(term.name)+"\n                  ")]),_vm._v(" "),_c('span',{staticClass:"ml-auto"},[(_vm.indexArr.indexOf(index) !== -1)?_c('svg',{staticClass:"option__graphic",attrs:{"aria-hidden":"true","tabindex":"-1"}},[_c('use',{attrs:{"href":"#up-arrow"}})]):_vm._e(),_vm._v(" "),(_vm.indexArr.indexOf(index) === -1)?_c('svg',{staticClass:"option__graphic",attrs:{"aria-hidden":"true","tabindex":"-1"}},[_c('use',{attrs:{"href":"#down-arrow"}})]):_vm._e()])]),_vm._v(" "),(_vm.indexArr.indexOf(index) !== -1)?_c('div',{staticClass:"grid gap-1"},_vm._l((term.filters),function(filter){return _c('label',{key:filter.slug,staticClass:"option w-full m-0",attrs:{"tabindex":"-1","gtm-data":"test"}},[_c('input',{attrs:{"type":"checkbox","tabindex":"-1"},domProps:{"value":filter.slug,"checked":filter.checked},on:{"change":function($event){return _vm.click({event: $event, data: filter})}}}),_vm._v(" "),_c('span',{staticClass:"option__base bg-transparent"},[_c('svg',{staticClass:"option__graphic",attrs:{"aria-hidden":"true","tabindex":"-1"}},[_c('use',{attrs:{"href":"#option-nyco-checkbox"}})]),_vm._v(" "),_c('span',{staticClass:"font-normal"},[_vm._v(_vm._s(filter.name))])])])}),0):_vm._e()])])})],2),_vm._v(" "),_c('div',{staticClass:"wrap gap-3 flex justify-center"},[_c('button',{staticClass:"btn-small tablet:btn desktop:btn btn-styled",attrs:{"disabled":_vm.totalFilters == 0},domProps:{"innerHTML":_vm._s(_vm.strings.RESET)},on:{"click":_vm.reset}}),_vm._v(" "),_c('button',{staticClass:"btn-small tablet:btn desktop:btn btn-secondary",on:{"click":_vm.scrollToTop}},[_vm._v(_vm._s(_vm.strings.APPLY_FILTERS))])])])]),_vm._v(" "),(_vm.init)?_c('div',{directives:[{name:"show",rawName:"v-show",value:(!_vm.filtersExpanded),expression:"!filtersExpanded"}],staticClass:"mb-5 tablet:mb-6 desktop:mb-7 mt-5 tablet:mt-6 desktop:mt-0"},[_c('div',{staticClass:"flex justify-center gap-x-[5%]"},[_c('section',{staticClass:"hidden desktop:flex w-1/4 p-3 rounded border border-scale-3"},[_c('form',{staticClass:"w-full"},[_c('div',[_c('h6',{staticClass:"font-bold"},[_vm._v("\n                "+_vm._s(_vm.strings.FILTER_BY)+"\n              ")]),_vm._v(" "),_c('div',_vm._l((_vm.terms),function(term,index){return _c('div',{key:term.slug},[_c('fieldset',{staticClass:"fieldset mb-3",attrs:{"tabindex":"-1"}},[_c('div',{staticClass:"border-b border-scale-3 flex",on:{"click":function($event){return _vm.toggleAccordion(index)}}},[_c('legend',{staticClass:"h6 mb-2 font-bold"},[_vm._v("\n                        "+_vm._s(term.name)+"\n                      ")]),_vm._v(" "),_c('span',{staticClass:"ml-auto"},[(_vm.indexArr.indexOf(index) !== -1)?_c('svg',{staticClass:"option__graphic",attrs:{"aria-hidden":"true","tabindex":"-1"}},[_c('use',{attrs:{"href":"#up-arrow"}})]):_vm._e(),_vm._v(" "),(_vm.indexArr.indexOf(index) === -1)?_c('svg',{staticClass:"option__graphic",attrs:{"aria-hidden":"true","tabindex":"-1"}},[_c('use',{attrs:{"href":"#down-arrow"}})]):_vm._e()])]),_vm._v(" "),(_vm.indexArr.indexOf(index) !== -1)?_c('div',{staticClass:"grid gap-1"},_vm._l((term.filters),function(filter){return _c('label',{key:filter.slug,staticClass:"option w-full m-0",attrs:{"tabindex":"-1","gtm-data":"test"}},[_c('input',{attrs:{"type":"checkbox","tabindex":"-1"},domProps:{"value":filter.slug,"checked":filter.checked},on:{"change":function($event){return _vm.click({event: $event, data: filter})}}}),_vm._v(" "),_c('span',{staticClass:"option__base bg-transparent border-0 items-center"},[_c('svg',{staticClass:"option__graphic w-3 h-3",attrs:{"aria-hidden":"true","tabindex":"-1"}},[_c('use',{attrs:{"href":"#option-nyco-checkbox"}})]),_vm._v(" "),_c('span',{staticClass:"font-normal"},[_vm._v(_vm._s(filter.name))])])])}),0):_vm._e()])])}),0)])])]),_vm._v(" "),_c('div',{staticClass:"w-full desktop:w-1/2"},[_c('section',{staticClass:"page-max mx-2 tablet:mx-7 desktop:mx-0"},[(!_vm.loading)?_c('div',[_c('div',{staticClass:"mb-3"},[(_vm.posts != null)?_c('h2',{staticClass:"text-p font-p inline-block m-0",attrs:{"data-alert":"text","data-dialog-focus-on-close":"aria-c-filter","aria-live":"polite"}},[_c('span',{domProps:{"innerHTML":_vm._s(_vm.strings.SHOWING.replace('{{ TOTAL_VISIBLE }}', _vm.totalVisible).replace('{{ TOTAL }}', _vm.headers.total))}})]):_vm._e()]),_vm._v(" "),_c('div',{staticClass:"grid gap-3 mb-3"},_vm._l((_vm.postsFlat),function(post){return _c('EmployerProgram',{key:post.id,attrs:{"post":post,"strings":_vm.strings}})}),1)]):_vm._e(),_vm._v(" "),(_vm.none)?_c('div',{staticClass:"flex items-center text-em justify-center py-4"},[_c('p',[_vm._v(_vm._s(_vm.strings.NO_RESULTS)+" "),_c('button',{domProps:{"innerHTML":_vm._s(_vm.strings.RESET)},on:{"click":_vm.reset}})])]):_vm._e()])])])]):_c('section',{staticClass:"page-max desktop:px-6"},[_c('div',{staticClass:"flex items-center text-em justify-center py-8"},[_c('svg',{staticClass:"spinner icon-4 block mie-2",attrs:{"viewBox":"0 0 24 24","version":"1.1","xmlns":"http://www.w3.org/2000/svg","xmlns:xlink":"http://www.w3.org/1999/xlink"}},[_c('circle',{staticClass:"spinner__path",attrs:{"cx":"12","cy":"12","r":"10","fill":"none"}})]),_vm._v("\n\n      "+_vm._s(_vm.strings.LOADING)+"\n    ")])])])])};
 	var __vue_staticRenderFns__$1 = [];
 
@@ -1325,8 +1325,8 @@
 	          CLOSE: 'Close',
 	          TOGGLE_ALL: 'Toggle all {{ TERM }}',
 	          CLOSE_AND_SEE_PROGRAMS: 'Close and see {{ number }} programs',
-	          PAGE_TITLE: 'Hire or develop talent',
-	          PAGE_SUBTITLE: 'The City can help find candidates or help you build a talent pipeline for your business',
+	          PAGE_TITLE: 'Connect to services',
+	          PAGE_SUBTITLE: 'The City can help you find talent for your business. You can also partner with services to build a talent pipeline by hosting interns or apprentices.',
 	          PAGE_CONTENT: (config.content) ? config.content.innerHTML : '',
 	          BY: 'by',
 	          SERVICES: 'Services Provided',

wp-content/themes/workingnyc/src/js/archive-employer-programs.js

@@ -64,8 +64,8 @@ new Vue({
           CLOSE: 'Close',
           TOGGLE_ALL: 'Toggle all {{ TERM }}',
           CLOSE_AND_SEE_PROGRAMS: 'Close and see {{ number }} programs',
-          PAGE_TITLE: 'Hire or develop talent',
-          PAGE_SUBTITLE: 'The City can help find candidates or help you build a talent pipeline for your business',
+          PAGE_TITLE: 'Connect to services',
+          PAGE_SUBTITLE: 'The City can help you find talent for your business. You can also partner with services to build a talent pipeline by hosting interns or apprentices.',
           PAGE_CONTENT: (config.content) ? config.content.innerHTML : '',
           BY: 'by',
           SERVICES: 'Services Provided',

wp-content/themes/workingnyc/views/employer-programs/archive.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="layout-content bg-scale-3">
+    <div class="layout-content bg-[#EEF4FF]">
       <div class="page-max">
         <header class="o-header">
           <div>

wp-content/themes/workingnyc/views/objects/footer.twig

@@ -7,7 +7,7 @@
         </div>
         <div class="tablet:float-right desktop:float-right">
         {# TODO: feedback URL should come from global field + shortcode #}
-        <a class="btn btn-small tablet:btn btn-secondary pointer-events-auto" href="https://airtable.com/appHMkkbuN08pgjwz/shrfQGpXvo9mmmHpJ">Send us feedback</a>
+        <a class="btn btn-small tablet:btn btn-secondary pointer-events-auto" target="_blank" href="{{ options.feedback_form_link }}">Send us feedback</a>
         </div>
     </nav>
     <nav class="o-attribution__flex border-t border-slate-300 pt-3 items-start">