Skip to content

D
dev.biuro
Commit 707cf328 authored by Simon's avatar Simon
Browse files
Options

categories mobile version

parent 861276f7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 46 deletions
README.md
View file @ 707cf328
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
## Production ## Production
- build CSS & JS assets - `C:\web\dev.biuro\ npm run build` - build CSS & JS assets - `C:\web\dev.biuro\ npm run build`
- build new image `docker build -t biuro/web:0.0.28 .` (update version number) - build new image `docker build -t biuro/web:0.0.30 .` (update version number)
- login to biuro docker account `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs` - login to biuro docker account `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs`
- push image to docker repository - `docker push biuro/web:0.0.28` - push image to docker repository - `docker push biuro/web:0.0.30`
## Production ## Production
- update biuro/web image version in .env file (staging or www) - update biuro/web image version in .env file (staging or www)
......
nginx/redirects/biuro.lt.conf
View file @ 707cf328
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
location ^~ /darbo-pasiulymai/ { location ^~ /darbo-pasiulymai/ {
try_files $uri $uri/ /index.php?$args; try_files $uri $uri/ /index.php?$args;
if ($args ~* "/?search=") { rewrite ^ /darbuotojams/darbo-pasiulymai/? permanent; }
if ($args ~* "/?type=[0-9]+") { rewrite ^ /darbuotojams/darbo-pasiulymai/? permanent; } if ($args ~* "/?type=[0-9]+") { rewrite ^ /darbuotojams/darbo-pasiulymai/? permanent; }
if ($args ~* "/?start=0") { rewrite ^ /darbuotojams/darbo-pasiulymai/? permanent; } if ($args ~* "/?start=0") { rewrite ^ /darbuotojams/darbo-pasiulymai/? permanent; }
......
wp-content/themes/biuro/css/05-layout/_layout--aside.css
View file @ 707cf328
...@@ -31,4 +31,15 @@ ...@@ -31,4 +31,15 @@
} }
} }
.l-aside--search {
@media (--max--medium) {
display: none; position: fixed; top: 0; right: 0; width: 310px; padding-left: 40px; height: 100%; overflow: auto; z-index: 20;
}
}
.l-aside--close { position: fixed; top: 0; right: 265px; padding: 14px 17px; cursor: pointer;
@media (--min--medium) {
display: none;
}
}
/* critical:end */ /* critical:end */
wp-content/themes/biuro/css/05-layout/_layout--content.css
View file @ 707cf328
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
} }
.l-content--heading { display: block; padding-top: 40px; padding-bottom: 25px; .l-content--heading { display: block; padding-top: 20px; padding-bottom: 15px;
@media (--min--medium) { @media (--min--medium) {
padding-left: 320px; padding-left: 320px; padding-top: 40px; padding-bottom: 25px;
} }
h1 { margin: 0; padding: 0; color: #2A3644; font-size: 25px; font-weight: 500; line-height: 29px; } h1 { margin: 0; padding: 0; color: #2A3644; font-size: 25px; font-weight: 500; line-height: 29px; }
} }
......
wp-content/themes/biuro/css/05-layout/_layout--section.css
View file @ 707cf328
...@@ -2,12 +2,14 @@ ...@@ -2,12 +2,14 @@
/* critical:start */ /* critical:start */
.l-section { padding: 20px 0; background: #111d1e url(/wp-content/themes/biuro/i/search-page.png) no-repeat 50% 50%; background-size: cover; .l-section { padding: 20px 0; background-repeat: no-repeat; background-position: 50% 50%; background-size: cover;
@media (--min--medium) { @media (--min--medium) {
padding: 30px 0; padding: 30px 0;
} }
} }
.l-section--search-page { background-color: #111d1e; background-image: url(/wp-content/themes/biuro/i/search-page.png) }
.l-section--vdb { background-color: #086335; background-image: url(/wp-content/themes/biuro/i/vdb/section.png); } .l-section--vdb { background-color: #086335; background-image: url(/wp-content/themes/biuro/i/vdb/section.png); }
.l-section--front-page { background: url(/wp-content/themes/biuro/i/front-page.png) no-repeat 50% 50%; background-size: cover; margin-bottom: 2px; .l-section--front-page { background: url(/wp-content/themes/biuro/i/front-page.png) no-repeat 50% 50%; background-size: cover; margin-bottom: 2px;
......
wp-content/themes/biuro/css/07-components/_component--btn.css
View file @ 707cf328
...@@ -35,4 +35,6 @@ ...@@ -35,4 +35,6 @@
&:hover { border-color: var(--color--green-darker); background-color: var(--color--green-darker); color: #fff; } &:hover { border-color: var(--color--green-darker); background-color: var(--color--green-darker); color: #fff; }
} }
.c-btn--filter { color: #2A3644; font-size: 15px; line-height: 26px; text-align: center; background: #fff; border-radius: 3px; padding: 6px 15px 6px 12px; }
/* critical:end */ /* critical:end */
wp-content/themes/biuro/css/07-components/_component--ico.css
View file @ 707cf328
...@@ -13,4 +13,7 @@ ...@@ -13,4 +13,7 @@
.c-ico--email { float: left; margin: 6px 10px 0 0; } .c-ico--email { float: left; margin: 6px 10px 0 0; }
.c-ico--address { float: left; margin: 3px 12px 0 3px; } .c-ico--address { float: left; margin: 3px 12px 0 3px; }
.c-ico--filter { float: left; margin: 3px 15px 0 3px; }
/* critical:end */ /* critical:end */
wp-content/themes/biuro/css/07-components/_component--jobs-section.css
View file @ 707cf328
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.c-jobs-section { margin: 0 20px 20px 0; padding: 28px 28px 23px; border-radius: 3px; background-color: #ffffff; .c-jobs-section { margin: 0 20px 20px 0; padding: 28px 28px 23px; border-radius: 3px; background-color: #ffffff;
@media (--max--medium) { @media (--max--medium) {
display: none; border-radius: 0; margin: 0;
} }
} }
...@@ -23,6 +23,10 @@ ...@@ -23,6 +23,10 @@
.c-jobs-section--item { line-height: 33px; } .c-jobs-section--item { line-height: 33px; }
.c-jobs-section--item-active {
.c-jobs-section--anchor { color: #1FB299; }
}
.c-jobs-section--anchor { color: #939393; font-size: 14px; text-decoration: none; .c-jobs-section--anchor { color: #939393; font-size: 14px; text-decoration: none;
&:hover { text-decoration: underline; } &:hover { text-decoration: underline; }
} }
......
wp-content/themes/biuro/css/07-components/_component--search.css
View file @ 707cf328
...@@ -11,6 +11,19 @@ ...@@ -11,6 +11,19 @@
} }
} }
@media (--max--medium) {
.l-section--search-page { padding: 10px 0;
.c-search { flex-direction: row; margin: 0 10px; border-radius: 3px }
.c-search--col-location { display: none; }
.c-search--col-keyword { flex: 1 1 auto; border-radius: 3px 0 0 3px; }
.c-search--btn-text { display: none; }
.c-btn--search-small { min-width: 35px; margin: 5px; padding: 9px 7px 8px 8px; }
.c-search--input { height: 45px; padding: 0 0 0 15px; }
.c-search--col ul { top: 45px; }
.c-ico--area { display: none; }
}
}
.c-search--col { position: relative; flex: 1 1 auto; background-color: #FFFFFF; .c-search--col { position: relative; flex: 1 1 auto; background-color: #FFFFFF;
@media (--max--medium) { @media (--max--medium) {
flex: 0 0 60px; flex: 0 0 60px;
...@@ -45,6 +58,11 @@ ...@@ -45,6 +58,11 @@
.c-search--location { } .c-search--location { }
.c-search--keyword { } .c-search--keyword { }
.c-search--filters { padding: 10px 10px; text-align: right;
@media (--min--medium) {
display: none;
}
}
.l-section--front-page { .l-section--front-page {
.c-search { box-shadow: 6px 10px 48px 0 #D4DBE4; .c-search { box-shadow: 6px 10px 48px 0 #D4DBE4;
......
wp-content/themes/biuro/css/08-states/__states.css
View file @ 707cf328
...@@ -5,3 +5,14 @@ is-, has-: Signify that the piece of UI in question is currently styled a certai ...@@ -5,3 +5,14 @@ is-, has-: Signify that the piece of UI in question is currently styled a certai
========================================================================== */ ========================================================================== */
@import '_state--nav.css'; @import '_state--nav.css';
@media (--max--medium) {
.is-aside--open { overflow: hidden;
.l-aside--search { display: block; }
.l-header { z-index: -1; }
&:after { content: ''; position: fixed; opacity: 0.97; background-color: #2A3644; top: 0; left: 0; width: 100%; height: 100%; }
.c-jobs-section--content { max-height: 2000em; }
.c-jobs-section--expand { display: none; }
}
}
wp-content/themes/biuro/css/core-38915cf122.min.css 0 → 100644
View file @ 707cf328
This diff is collapsed.
wp-content/themes/biuro/css/core-4b9d1f19e3.min.css deleted 100644 → 0
View file @ 861276f7
This diff is collapsed.
wp-content/themes/biuro/footer.php
View file @ 707cf328
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-THF42F');</script> })(window,document,'script','dataLayer','GTM-THF42F');</script>
<script src="/wp-content/themes/biuro/js/main-8d255f4a.min.js" async></script> <script src="/wp-content/themes/biuro/js/main-63c39ea0.min.js" async></script>
<?php wp_footer(); ?> <?php wp_footer(); ?>
</body> </body>
</html> </html>
wp-content/themes/biuro/header.php
View file @ 707cf328
...@@ -23,16 +23,16 @@ ...@@ -23,16 +23,16 @@
?> ?>
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet">
<style><?php include 'css/core-4b9d1f19e3.min.css'; ?></style> <style><?php include 'css/core-38915cf122.min.css'; ?></style>
<link rel="preload" href="/wp-content/themes/biuro/css/main-40683cd0ec.min.css" as="style" onload="this.rel='stylesheet'"> <link rel="preload" href="/wp-content/themes/biuro/css/main-e4153aa60a.min.css" as="style" onload="this.rel='stylesheet'">
<link rel="preload" href="/wp-content/themes/biuro/fonts/pt_sans_narrow.woff2" as="font" type="font/woff2" crossorigin> <link rel="preload" href="/wp-content/themes/biuro/fonts/pt_sans_narrow.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/wp-content/themes/biuro/fonts/pt_sans_narrow_bold.woff2" as="font" type="font/woff2" crossorigin> <link rel="preload" href="/wp-content/themes/biuro/fonts/pt_sans_narrow_bold.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/wp-content/themes/biuro/fonts/bebas-neue.woff2" as="font" type="font/woff2" crossorigin> <link rel="preload" href="/wp-content/themes/biuro/fonts/bebas-neue.woff2" as="font" type="font/woff2" crossorigin>
<noscript> <noscript>
<link rel="stylesheet" href="/wp-content/themes/biuro/css/main-40683cd0ec.min.css"> <link rel="stylesheet" href="/wp-content/themes/biuro/css/main-e4153aa60a.min.css">
</noscript> </noscript>
<?php wp_head(); ?> <?php wp_head(); ?>
......
wp-content/themes/biuro/js/main.js
View file @ 707cf328
...@@ -84,6 +84,13 @@ if (module.hot) { ...@@ -84,6 +84,13 @@ if (module.hot) {
}); });
}); });
document.querySelectorAll('.js-toggle--aside').forEach((node) => {
node.addEventListener('click', (e) => {
e.preventDefault();
document.body.classList.toggle('is-aside--open');
});
});
})(window); })(window);
const mapStyles = [ const mapStyles = [
......
wp-content/themes/biuro/page-vasaros-darbu-bankas.php
View file @ 707cf328
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
get_header(); ?> get_header(); ?>
<div class="l-section l-section--vdb"> <div class="l-section l-section--search-page l-section--vdb">
<div class="l-section--inner"> <div class="l-section--inner">
<?php <?php
if (get_page_template_slug() != 'sales-page.php'): if (get_page_template_slug() != 'sales-page.php'):
...@@ -29,10 +29,17 @@ get_header(); ?> ...@@ -29,10 +29,17 @@ get_header(); ?>
<p class="c-vdb--top-content"> <p class="c-vdb--top-content">
<?php _e('Find summer job – look through the job ads, we are constantly updating the list and adding new ones.', 'biuro'); ?> <?php _e('Find summer job – look through the job ads, we are constantly updating the list and adding new ones.', 'biuro'); ?>
</p> </p>
</div> </div>
</div> </div>
<div class="c-search--filters">
<button class="js-toggle--aside o-btn c-btn--filter">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" width="17" height="17" class="c-ico--filter">
<path d="M907.8,100.2l-346,380v419.7l-124.5-98.3v-322l-345-379.4H907.8 M907.8,17.9H92.2c-32.6,0-62,19.2-75.2,49c-13.2,29.8-7.5,64.5,14.4,88.6L355,511.3v290.2c0,25.2,11.5,49,31.3,64.6l124.5,98.3c14.8,11.7,32.8,17.7,51,17.7c12.2,0,24.5-2.7,35.9-8.2c28.4-13.7,46.4-42.5,46.4-74V512l324.6-356.5c21.9-24.1,27.6-58.8,14.4-88.6C969.8,37.1,940.3,17.9,907.8,17.9L907.8,17.9z"/>
</svg> <?php _e('Other filters', 'biuro'); ?>
</button>
</div>
<div id="content" class="l-main"> <div id="content" class="l-main">
<div class="l-content l-content--heading"> <div class="l-content l-content--heading">
...@@ -48,14 +55,25 @@ get_header(); ?> ...@@ -48,14 +55,25 @@ get_header(); ?>
</div> </div>
<div class="l-content"> <div class="l-content">
<aside class="l-aside"> <aside class="l-aside l-aside--search">
<?php <?php
get_template_part( 'template-parts/layout/aside', 'job-list' ); get_template_part( 'template-parts/layout/aside', 'job-list' );
?> ?>
<span class="js-toggle--aside l-aside--close">
<svg width="13px" height="13px" viewBox="0 0 13 13" xmlns="http://www.w3.org/2000/svg">
<g id="FINAL@" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square">
<g id="DUK" transform="translate(-233.000000, -657.000000)" fill-rule="nonzero" stroke="#ffffff" stroke-width="2">
<g id="Group-" transform="translate(202.000000, 624.000000)">
<g id="Group" transform="translate(26.000000, 28.000000)">
<path d="M11.5,11.5 L11.5,3.5 L11.5,11.5 L3.5,11.5 L11.5,11.5 Z M11.5,11.5 L11.5,19.5 L11.5,11.5 L19.5,11.5 L11.5,11.5 Z" id="Combined-Shape" transform="translate(11.500000, 11.500000) rotate(-45.000000) translate(-11.500000, -11.500000) "></path>
</g>
</g>
</g>
</g>
</svg>
</span>
</aside><!-- .l-aside --> </aside><!-- .l-aside -->
<main id="main" class="l-main"> <main id="main" class="l-main">
<?php <?php
......
wp-content/themes/biuro/search.php
View file @ 707cf328
...@@ -17,30 +17,22 @@ ...@@ -17,30 +17,22 @@
get_header(); ?> get_header(); ?>
<div class="l-section <?php if ( is_front_page() ): ?> l-section--front-page <?php elseif (get_page_template_slug() == 'sales-page.php'): ?> l-section--sales-page <?php endif; ?>"> <div class="l-section l-section--search-page ">
<div class="l-section--inner"> <div class="l-section--inner">
<?php
if ( is_front_page() || get_page_template_slug() == 'sales-page.php' ):
while ( have_posts() ) :
?>
<div class="c-heading <?php if ( is_front_page() ): ?> c-heading--front-page <?php elseif (get_page_template_slug() == 'sales-page.php'): ?> c-heading--sales-page <?php endif; ?>">
<?php
the_post();
the_content();
?>
</div>
<?php <?php
endwhile;
endif;
if (get_page_template_slug() != 'sales-page.php'):
get_search_form(); get_search_form();
endif;
?> ?>
</div> </div>
</div> </div>
<div class="c-search--filters">
<button class="js-toggle--aside o-btn c-btn--filter">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" width="17" height="17" class="c-ico--filter">
<path d="M907.8,100.2l-346,380v419.7l-124.5-98.3v-322l-345-379.4H907.8 M907.8,17.9H92.2c-32.6,0-62,19.2-75.2,49c-13.2,29.8-7.5,64.5,14.4,88.6L355,511.3v290.2c0,25.2,11.5,49,31.3,64.6l124.5,98.3c14.8,11.7,32.8,17.7,51,17.7c12.2,0,24.5-2.7,35.9-8.2c28.4-13.7,46.4-42.5,46.4-74V512l324.6-356.5c21.9-24.1,27.6-58.8,14.4-88.6C969.8,37.1,940.3,17.9,907.8,17.9L907.8,17.9z"/>
</svg> <?php _e('Other filters', 'biuro'); ?>
</button>
</div>
<div id="content" class="l-main"> <div id="content" class="l-main">
<div class="l-content l-content--heading"> <div class="l-content l-content--heading">
...@@ -56,10 +48,23 @@ get_header(); ?> ...@@ -56,10 +48,23 @@ get_header(); ?>
</div> </div>
<div class="l-content"> <div class="l-content">
<aside class="l-aside"> <aside class="l-aside l-aside--search">
<?php <?php
get_template_part( 'template-parts/layout/aside', 'job-list' ); get_template_part( 'template-parts/layout/aside', 'job-list' );
?> ?>
<span class="js-toggle--aside l-aside--close">
<svg width="13px" height="13px" viewBox="0 0 13 13" xmlns="http://www.w3.org/2000/svg">
<g id="FINAL@" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square">
<g id="DUK" transform="translate(-233.000000, -657.000000)" fill-rule="nonzero" stroke="#ffffff" stroke-width="2">
<g id="Group-" transform="translate(202.000000, 624.000000)">
<g id="Group" transform="translate(26.000000, 28.000000)">
<path d="M11.5,11.5 L11.5,3.5 L11.5,11.5 L3.5,11.5 L11.5,11.5 Z M11.5,11.5 L11.5,19.5 L11.5,11.5 L19.5,11.5 L11.5,11.5 Z" id="Combined-Shape" transform="translate(11.500000, 11.500000) rotate(-45.000000) translate(-11.500000, -11.500000) "></path>
</g>
</g>
</g>
</g>
</svg>
</span>
</aside><!-- .l-aside --> </aside><!-- .l-aside -->
......
wp-content/themes/biuro/searchform.php
View file @ 707cf328
...@@ -235,6 +235,6 @@ endif; ...@@ -235,6 +235,6 @@ endif;
<button class="o-btn c-btn--main <?php if ( is_front_page() ): ?>c-btn--search<?php else: ?>c-btn--search-small<?php endif; ?>" type="submit" value="1"> <button class="o-btn c-btn--main <?php if ( is_front_page() ): ?>c-btn--search<?php else: ?>c-btn--search-small<?php endif; ?>" type="submit" value="1">
<svg xmlns="http://www.w3.org/2000/svg" width="17px" height="17px" viewBox="0 0 17 17" class="c-ico--search"> <svg xmlns="http://www.w3.org/2000/svg" width="17px" height="17px" viewBox="0 0 17 17" class="c-ico--search">
<path fill="#FFFFFF" d="M16.884,15.694c0.156,0.156,0.156,0.408,0,0.564l-0.75,0.75c-0.156,0.156-0.408,0.156-0.564,0 l-4.031-4.031c-0.073-0.076-0.116-0.176-0.116-0.282v-0.438c-1.212,1.046-2.789,1.68-4.516,1.68C3.091,13.938,0,10.846,0,7.031 s3.091-6.906,6.906-6.906c3.815,0,6.906,3.091,6.906,6.906c0,1.727-0.634,3.304-1.68,4.516h0.438c0.106,0,0.206,0.04,0.282,0.116 L16.884,15.694z M6.906,12.344c2.935,0,5.313-2.377,5.313-5.312S9.841,1.719,6.906,1.719c-2.935,0-5.313,2.377-5.313,5.312 S3.971,12.344,6.906,12.344z"/> <path fill="#FFFFFF" d="M16.884,15.694c0.156,0.156,0.156,0.408,0,0.564l-0.75,0.75c-0.156,0.156-0.408,0.156-0.564,0 l-4.031-4.031c-0.073-0.076-0.116-0.176-0.116-0.282v-0.438c-1.212,1.046-2.789,1.68-4.516,1.68C3.091,13.938,0,10.846,0,7.031 s3.091-6.906,6.906-6.906c3.815,0,6.906,3.091,6.906,6.906c0,1.727-0.634,3.304-1.68,4.516h0.438c0.106,0,0.206,0.04,0.282,0.116 L16.884,15.694z M6.906,12.344c2.935,0,5.313-2.377,5.313-5.312S9.841,1.719,6.906,1.719c-2.935,0-5.313,2.377-5.313,5.312 S3.971,12.344,6.906,12.344z"/>
</svg> <?php _e('Search', 'biuro'); ?> </svg> <span class="c-search--btn-text"><?php _e('Search', 'biuro'); ?></span>
</button> </button>
</form> </form>
wp-content/themes/biuro/template-parts/layout/aside-job-list.php
View file @ 707cf328
...@@ -26,17 +26,23 @@ function getSiteTree($taxonomy, $section, $searchQuery) ...@@ -26,17 +26,23 @@ function getSiteTree($taxonomy, $section, $searchQuery)
if ( !empty( $terms ) && ! is_wp_error( $terms ) ): if ( !empty( $terms ) && ! is_wp_error( $terms ) ):
$res = array(); $res = array();
if ($searchQuery['city']):
$city = get_term_by( 'name', preg_replace('/[\+]/', ' ', $searchQuery['city']), 'city' );
endif;
if ($searchQuery['s']):
$field = get_term_by( 'name', preg_replace('/[\+]/', ' ', $searchQuery['s']), 'field' );
$type = get_term_by( 'name', preg_replace('/[\+]/', ' ', $searchQuery['s']), 'type' );
endif;
foreach ( $terms as $term ): foreach ( $terms as $term ):
$termID = $term->term_id; $termID = $term->term_id;
$active = false;
$where = 'valid.meta_value > "' . date('Y-m-d', strtotime('-1 days')) . '" AND ' . $taxonomy . '.term_id = ' . $termID; $where = 'valid.meta_value > "' . date('Y-m-d', strtotime('-1 days')) . '" AND ' . $taxonomy . '.term_id = ' . $termID;
$counter = $where; $counter = $where;
if ($searchQuery['s'] && $taxonomy == 'city'): if ($taxonomy == 'city'):
$field = get_term_by( 'name', preg_replace('/[\+]/', ' ', $searchQuery['s']), 'field' );
$type = get_term_by( 'name', preg_replace('/[\+]/', ' ', $searchQuery['s']), 'type' );
if ( $field ) : if ( $field ) :
$counter = $counter . ' AND field.term_id = ' . $field->term_id; $counter = $counter . ' AND field.term_id = ' . $field->term_id;
elseif ( $type ) : elseif ( $type ) :
...@@ -45,12 +51,18 @@ function getSiteTree($taxonomy, $section, $searchQuery) ...@@ -45,12 +51,18 @@ function getSiteTree($taxonomy, $section, $searchQuery)
$counter = $counter . ' AND (t.post_title LIKE "%' . $searchQuery['s'] . '%" OR t.post_content LIKE "%' . $searchQuery['s'] . '%")'; $counter = $counter . ' AND (t.post_title LIKE "%' . $searchQuery['s'] . '%" OR t.post_content LIKE "%' . $searchQuery['s'] . '%")';
endif; endif;
elseif ($searchQuery['city'] && ($taxonomy == 'type' || $taxonomy == 'field')): if ( $city && $city->term_id == $termID ) :
$city = get_term_by( 'name', preg_replace('/[\+]/', ' ', $searchQuery['city']), 'city' ); $active = true;
endif;
elseif ($taxonomy == 'type' || $taxonomy == 'field'):
if ( $city ) : if ( $city ) :
$counter = $counter . ' AND city.term_id = ' . $city->term_id; $counter = $counter . ' AND city.term_id = ' . $city->term_id;
endif; endif;
if ( $field && $field->term_id == $termID || $type && $type->term_id == $termID) :
$active = true;
endif;
endif; endif;
$params = array( $params = array(
...@@ -77,7 +89,8 @@ function getSiteTree($taxonomy, $section, $searchQuery) ...@@ -77,7 +89,8 @@ function getSiteTree($taxonomy, $section, $searchQuery)
'name' => $page['post_title'], 'name' => $page['post_title'],
'href' => getPageURL($taxonomy, get_page_link( $page['ID'] ), $searchQuery, $termID), 'href' => getPageURL($taxonomy, get_page_link( $page['ID'] ), $searchQuery, $termID),
'order' => $order, 'order' => $order,
'total' => $jobsCounter->total() 'total' => $jobsCounter->total(),
'active' => $active
)); ));
endif; endif;
...@@ -120,7 +133,7 @@ function getSiteTree($taxonomy, $section, $searchQuery) ...@@ -120,7 +133,7 @@ function getSiteTree($taxonomy, $section, $searchQuery)
foreach ( $res as $r ): foreach ( $res as $r ):
?> ?>
<li class="c-jobs-section--item"><a href="<?php echo $r['href']; ?>" title="<?php echo $r['name']; ?>" class="c-jobs-section--anchor"><?php echo $r['name'] . ' (' . $r['total'] . ')'; ?></a></li> <li class="c-jobs-section--item <?php if ($r['active']): echo 'c-jobs-section--item-active'; endif; ?>"><a href="<?php echo $r['href']; ?>" title="<?php echo $r['name']; ?>" class="c-jobs-section--anchor"><?php echo $r['name'] . ' (' . $r['total'] . ')'; ?></a></li>
<?php <?php
endforeach; endforeach;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment