Merge branch 'release-1.12.2' into dev

.gitattributes

+* text=auto eol=lf

README.md

@@ -20,9 +20,9 @@
 
 ## Production
 - build CSS & JS assets - `C:\web\dev.biuro\ npm run build`
-- build new image `docker build -t biuro/web:1.12.1 .` (update version number)
+- build new image `docker build -t biuro/web:1.12.2 .` (update version number)
 - login to biuro docker account  `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs`
-- push image to docker repository - `docker push biuro/web:1.12.1`
+- push image to docker repository - `docker push biuro/web:1.12.2`
 
 ## Production
 - update biuro/web image version in .env file (staging or www)

package.json

 {
   "name": "biuro",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "Biuro WP theme",
   "scripts": {
     "dev": "gulp --require @babel/register --gulpfile tasks",
@@ -16,14 +16,14 @@
     "@babel/preset-env": "^7.5.5",
     "@babel/register": "^7.5.5",
     "@babel/runtime": "^7.5.5",
-    "autoprefixer": "^9.6.1",
+    "autoprefixer": "^9.7.3",
     "babel-loader": "^8.0.6",
     "browser-sync": "^2.26.7",
     "connect-modrewrite": "^0.10.2",
     "css-mqpacker": "^7.0.0",
     "cssnano": "^4.1.10",
     "del": "^5.0.0",
-    "eslint": "^6.1.0",
+    "eslint": "^6.7.2",
     "eslint-config-standard": "^13.0.1",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-node": "^9.1.0",

wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--employees--step-1.php

@@ -46,7 +46,7 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $nameMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <label class="c-form--label" for="form-phone"><?php _e('Phone no.', 'biuro-contacts'); ?></label>
@@ -58,7 +58,7 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $phoneMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div id="agree"></div>
 
@@ -72,7 +72,7 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $emailMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <div class="c-form--submit-wrap">
@@ -88,7 +88,7 @@ if ( ! defined( 'WPINC' ) ) die;
     endif;
 ?>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
 <?php
 /*
@@ -102,7 +102,7 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $agreeMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 */
 ?>
 
@@ -113,4 +113,4 @@ if ( ! defined( 'WPINC' ) ) die;
             <?php _e('This site is protected by reCAPTCHA and the Google <a href="https://policies.google.com/privacy">Privacy Policy</a> and <a href="https://policies.google.com/terms">Terms of Service</a> apply.', 'biuro-contacts'); ?>
             <input type="hidden" name="agree" value="1">
         </div>
-    </div><!-- .c-form--row -->
+    </div>

wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--employees--step-2.php

@@ -39,18 +39,18 @@ if ( ! defined( 'WPINC' ) ) die;
             <input list="form-cities" type="text" class="c-form--input" id="form-city" name="city" value="">
             <input type="hidden" id="form-city-id" name="city_id" value="">
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <label class="c-form--label" for="form-message"><?php _e('Message', 'biuro-contacts'); ?></label>
         <div class="c-form--textarea-wrap">
             <textarea name="message" id="form-message" cols="30" rows="3" class="c-form--textarea" placeholder="<?php _e("For example: I'm looking for a job in manufacturing", 'biuro-contacts'); ?>"></textarea>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <div class="c-form--input-file-wrap">
-            <input type="file" class="js-form--input-file c-form--input-file" id="form-cv" name="cv" value="" accept="application/pdf, application/doc, application/docx, application/rtf, application/txt, application/odf, application/msword, image/jpg, image/jpeg, image/png">
+            <input type="file" class="js-form--input-file c-form--input-file" id="form-cv" name="cv" accept="application/pdf, application/doc, application/docx, application/rtf, application/txt, application/odf, application/msword, image/jpg, image/jpeg, image/png">
             <button class="c-form--input-file-btn">
                 <svg width="16px" height="21px" class="c-ico--attachment">
                     <use xlink:href="#ico--attachment"></use>
@@ -58,13 +58,13 @@ if ( ! defined( 'WPINC' ) ) die;
                 <span class="js-form--input-file-text c-form--input-file-text"><?php _e('CV', 'biuro-contacts'); ?></span>
             </button>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <div class="c-form--submit-wrap">
             <button type="submit" class="o-btn c-btn--main c-btn--fill" name="s" value="2"><?php _e('Submit', 'biuro-contacts'); ?></button>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--label-recaptcha">
         <?php _e('This site is protected by reCAPTCHA and the Google <a href="https://policies.google.com/privacy">Privacy Policy</a> and <a href="https://policies.google.com/terms">Terms of Service</a> apply.', 'biuro-contacts'); ?>

wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--employers--step-1.php

@@ -47,7 +47,7 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $nameMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <label class="c-form--label" for="form-phone"><?php _e('Phone no.', 'biuro-contacts'); ?></label>
@@ -59,7 +59,7 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $phoneMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div id="agree"></div>
 
@@ -73,13 +73,13 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $emailMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <div class="c-form--submit-wrap">
             <button type="submit" class="o-btn c-btn--main c-btn--fill" name="s" value="1"><?php _e('Submit', 'biuro-contacts'); ?></button>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
 <?php
 /*
@@ -93,7 +93,7 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $agreeMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 */
 ?>
 
@@ -104,4 +104,4 @@ if ( ! defined( 'WPINC' ) ) die;
             <?php _e('This site is protected by reCAPTCHA and the Google <a href="https://policies.google.com/privacy">Privacy Policy</a> and <a href="https://policies.google.com/terms">Terms of Service</a> apply.', 'biuro-contacts'); ?>
             <input type="hidden" name="agree" value="1">
         </div>
-    </div><!-- .c-form--row -->
+    </div>

wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--employers--step-2.php

@@ -24,20 +24,20 @@ if ( ! defined( 'WPINC' ) ) die;
         <div class="c-form--input-wrap">
             <input type="text" class="c-form--input" id="form-company" name="company" value="" autofocus="autofocus">
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <label class="c-form--label" for="form-message"><?php _e('Message', 'biuro-contacts'); ?></label>
         <div class="c-form--textarea-wrap">
             <textarea name="message" id="form-message" cols="30" rows="10" class="c-form--textarea"></textarea>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <div class="c-form--submit-wrap">
             <button type="submit" class="o-btn c-btn--main c-btn--fill" name="s" value="2"><?php _e('Submit', 'biuro-contacts'); ?></button>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--label-recaptcha">
         <?php _e('This site is protected by reCAPTCHA and the Google <a href="https://policies.google.com/privacy">Privacy Policy</a> and <a href="https://policies.google.com/terms">Terms of Service</a> apply.', 'biuro-contacts'); ?>

wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--position--step-1.php

@@ -31,5 +31,5 @@ if ( ! defined( 'WPINC' ) ) die;
 <?php
         endif;
  ?>
-    </div><!-- .c-form--row -->
+    </div>
 

wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--position--step-2.php

@@ -71,7 +71,7 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $nameMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 
 
     <div class="c-form--row">
@@ -84,7 +84,7 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $phoneMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 
 
     <div class="c-form--row">
@@ -97,7 +97,7 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $emailMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <label class="c-form--label" for="form-city"><?php _e('City', 'biuro-contacts'); ?></label>
@@ -119,7 +119,7 @@ if ( ! defined( 'WPINC' ) ) die;
             <input list="form-cities" type="text" class="c-form--input" id="form-city" name="city" value="<?php echo $cityValue; ?>">
             <input type="hidden" id="form-city-id" name="city_id" value="<?php echo $cityIDValue; ?>">
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div id="agree"></div>
 
@@ -128,11 +128,11 @@ if ( ! defined( 'WPINC' ) ) die;
         <div class="c-form--textarea-wrap">
             <textarea name="message" id="form-message" cols="30" rows="3" class="c-form--textarea" placeholder="<?php _e("For example: I'm looking for a job in manufacturing", 'biuro-contacts'); ?>"><?php echo $messageValue; ?></textarea>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <div class="c-form--input-file-wrap">
-            <input type="file" class="js-form--input-file c-form--input-file" id="form-cv" name="cv" value="" accept="application/pdf, application/doc, application/docx, application/rtf, application/txt, application/odf, application/msword, image/jpg, image/jpeg, image/png">
+            <input type="file" class="js-form--input-file c-form--input-file" id="form-cv" name="cv" accept="application/pdf, application/doc, application/docx, application/rtf, application/txt, application/odf, application/msword, image/jpg, image/jpeg, image/png">
             <button class="c-form--input-file-btn">
                 <svg width="16px" height="21px" class="c-ico--attachment">
                     <use xlink:href="#ico--attachment"></use>
@@ -145,20 +145,20 @@ if ( ! defined( 'WPINC' ) ) die;
                 <?php echo $cvMessage; ?>
             </div>
         <?php endif; ?>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <div class="c-form--label-infobox">
             <?php _e('We process your personal data to offer you jobs. More information at <a href="https://biuro.eu/privacy-en.html" target="_blank" rel="noopener">Personal Data Protection Policy.</a>', 'biuro-contacts'); ?>
             <input type="hidden" name="agree" value="1">
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <div class="c-form--submit-wrap">
             <button type="submit" class="o-btn c-btn--main c-btn--fill" name="s" value="2"><?php _e('Apply', 'biuro-contacts'); ?></button>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--label-recaptcha">
         <?php _e('This site is protected by reCAPTCHA and the Google <a href="https://policies.google.com/privacy">Privacy Policy</a> and <a href="https://policies.google.com/terms">Terms of Service</a> apply.', 'biuro-contacts'); ?>

wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--recommend.php

@@ -83,7 +83,7 @@ if ( ! defined( 'WPINC' ) ) die;
                         <?php echo $nameMessage; ?>
                     </div>
                 <?php endif; ?>
-            </div><!-- .c-form--row -->
+            </div>
 
             <div class="c-form--row">
                 <label class="c-form--label" for="form-phone"><?php _e('Your Phone no.', 'biuro-contacts'); ?></label>
@@ -95,7 +95,7 @@ if ( ! defined( 'WPINC' ) ) die;
                         <?php echo $phoneMessage; ?>
                     </div>
                 <?php endif; ?>
-            </div><!-- .c-form--row -->
+            </div>
 
             <div class="c-form--row">
                 <label class="c-form--label" for="form-email"><?php _e('Your Email address', 'biuro-contacts'); ?></label>
@@ -107,7 +107,7 @@ if ( ! defined( 'WPINC' ) ) die;
                         <?php echo $emailMessage; ?>
                     </div>
                 <?php endif; ?>
-            </div><!-- .c-form--row -->
+            </div>
 
             <div class="c-form--row">
                 <label class="c-form--label" for="form-city"><?php _e('Your City', 'biuro-contacts'); ?></label>
@@ -129,7 +129,7 @@ if ( ! defined( 'WPINC' ) ) die;
                     <input list="form-cities" type="text" class="c-form--input" id="form-city" name="city" value="<?php echo $cityValue; ?>">
                     <input type="hidden" id="form-city-id" name="city_id" value="<?php echo $cityIDValue; ?>">
                 </div>
-            </div><!-- .c-form--row -->
+            </div>
 
         </div><!-- .c-form--col -->
 
@@ -149,7 +149,7 @@ if ( ! defined( 'WPINC' ) ) die;
                         <?php echo $recommendNameMessage; ?>
                     </div>
                 <?php endif; ?>
-            </div><!-- .c-form--row -->
+            </div>
 
 
             <div class="c-form--row">
@@ -162,7 +162,7 @@ if ( ! defined( 'WPINC' ) ) die;
                         <?php echo $recommendPhoneMessage; ?>
                     </div>
                 <?php endif; ?>
-            </div><!-- .c-form--row -->
+            </div>
 
 
             <div class="c-form--row">
@@ -175,7 +175,7 @@ if ( ! defined( 'WPINC' ) ) die;
                         <?php echo $recommendEmailMessage; ?>
                     </div>
                 <?php endif; ?>
-            </div><!-- .c-form--row -->
+            </div>
 
             <div class="c-form--row">
                 <label class="c-form--label" for="recommend-form-city"><?php _e('Friend City', 'biuro-contacts'); ?></label>
@@ -197,7 +197,7 @@ if ( ! defined( 'WPINC' ) ) die;
                     <input list="form-cities" type="text" class="c-form--input" id="recommend-form-city" name="recommend_city" value="<?php echo $recommendCityValue; ?>">
                     <input type="hidden" id="recommend-form-city-id" name="recommend_city_id" value="<?php echo $recommendCityIDValue; ?>">
                 </div>
-            </div><!-- .c-form--row -->
+            </div>
 
         </div><!-- .c-form--col -->
     </div><!-- .c-form--cols -->
@@ -218,13 +218,13 @@ if ( ! defined( 'WPINC' ) ) die;
         <div class="c-form--label-infobox">
             <?php _e('I allow, that my personal data will be used for communicating during the pre-contractual relationship. For more detailed information view our <a href="https://biuro.eu/privacy-en.html" target="_blank" rel="noopener">Personal Data Protection Policy.</a>', 'biuro-contacts'); ?>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--row">
         <div class="c-form--submit-wrap u-align--center">
             <button type="submit" class="o-btn c-btn--main c-btn--max-fill" name="s" value="1"><?php _e('Recommend', 'biuro-contacts'); ?></button>
         </div>
-    </div><!-- .c-form--row -->
+    </div>
 
     <div class="c-form--label-recaptcha">
         <?php _e('This site is protected by reCAPTCHA and the Google <a href="https://policies.google.com/privacy">Privacy Policy</a> and <a href="https://policies.google.com/terms">Terms of Service</a> apply.', 'biuro-contacts'); ?>

wp-content/plugins/biuro-feedbacks/biuro-feedbacks.php

@@ -131,7 +131,7 @@ class Biuro_Feedbacks extends WP_Widget {
 
                                     echo '<picture>';
                                         echo '<source srcset="/wp-content/themes/biuro/i/feedbacks/' . $img . '.webp" type="image/webp">';
-                                        echo '<img loading="lazy" src="/wp-content/themes/biuro/i/feedbacks/' . $img . '.png" width="85px" height="83px" alt="' . ${'name' . $i} . '" class="c-feedbacks--img">';
+                                        echo '<img loading="lazy" src="/wp-content/themes/biuro/i/feedbacks/' . $img . '.png" width="85" height="83" alt="' . ${'name' . $i} . '" class="c-feedbacks--img">';
                                     echo '</picture>';
                                 }
 

wp-content/themes/biuro/css/07-components/_component--form.css

@@ -50,7 +50,7 @@
     }
 }
 
-.c-form--success { margin: -28px -20px 20px; padding: 28px 20px 20px; border-radius: 3px 3px 0 0; text-align: center; color: #27b199; font-style: 18px; line-height: 25px; background: #e5fdf9; font-weight: 500;
+.c-form--success { margin: -28px -20px 20px; padding: 28px 20px 20px; border-radius: 3px 3px 0 0; text-align: center; color: #27b199; line-height: 25px; background: #e5fdf9; font-weight: 500;
     @media (--min--medium) {
         margin: -38px -35px 20px; padding: 28px 35px 20px;
     }

wp-content/themes/biuro/css/07-components/_component--job.css

@@ -50,6 +50,10 @@
     }
 }
 
+[href="https://maps.google.com/?q="] {
+    display: none !important;
+}
+
 /* critical:end */
 
 .c-job-facebook { max-width: 320px; margin: 0 auto; overflow: hidden;

wp-content/themes/biuro/css/07-components/_component--jobs.css

@@ -9,7 +9,7 @@
 
 .c-jobs--inner-custom { max-width: 990px; margin-right: auto; margin-left: auto; padding-right: 10px; padding-left: 10px; }
 
-.c-jobs--table {  margin: 0 0 20px; }
+.c-jobs--table {  margin: 0 0 20px; padding: 0; }
 
 .c-jobs--headline {margin: 0 0 25px; padding: 20px 20px 0;
     @media (--max--medium) {

wp-content/themes/biuro/footer.php

@@ -143,7 +143,7 @@
 
 ?>
 
-    <noscript><iframe src="//www.googletagmanager.com/ns.html?id=<?php echo $tagManager; ?>"height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+    <noscript><iframe src="//www.googletagmanager.com/ns.html?id=<?php echo $tagManager; ?>" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
     <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
     new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -154,7 +154,7 @@
 <?php
     endif;
 ?>
-    <script src="/wp-content/themes/biuro/js/main-4d30a78f.min.js" async></script>
+    <script src="/wp-content/themes/biuro/js/main-3772c487.min.js" async></script>
 
     <script src="/wp-content/themes/biuro/js/vendor/modernizr-custom.js" async></script>
 <?php

wp-content/themes/biuro/front-page.php

@@ -84,7 +84,7 @@
 <?php
             endif;
 ?>
-            </div><!-- .c-jobs--inner -->
+            </div>
         </div><!-- .c-jobs -->
 
 <?php
@@ -126,7 +126,7 @@
         ?>
                 </div>
 
-            </div><!-- .c-contact--inner -->
+            </div>
         </div><!-- .c-contact -->
 
     </main><!-- .l-main -->

wp-content/themes/biuro/functions.php

@@ -3,9 +3,11 @@
 // $time_start = microtime(true);
 
 function debug($arr) {
+    echo '<div style="position: fixed; top: 0; left: 0; border: 1px solid red; padding: 25px; background: #fff; z-index: 99999; height: 100vh; overflow-y: auto;" >';
     echo '<pre>';
     print_r( $arr );
     echo '</pre>';
+    echo '</div>';
 }
 
 function delog($str, $label = 'Label') {
@@ -939,8 +941,6 @@ function getResults($taxonomy, $term = '', $termID = '', $langID = '') {
     $today = date('Y-m-d');
     $order = ($taxonomy == 'city') ? 'no DESC' : 'total DESC';
 
-    $langID = 2;
-
     $condition = ($term && $termID) ? " AND `" . $term . "`.`term_id` = " . $termID : '';
     $structure =  ($term && $termID) ? " LEFT JOIN `{$prefix}term_relationships` AS `rel_term2` ON `rel_term2`.`object_id` = `t`.`ID`
         INNER JOIN `{$prefix}term_taxonomy` AS `rel_tt_term2` ON `rel_tt_term2`.`taxonomy` = '" . $term . "' AND `rel_tt_term2`.`term_taxonomy_id` = `rel_term2`.`term_taxonomy_id`

wp-content/themes/biuro/header-langing.php

-<?php
-    // global $time_start;
-    // $time_start = microtime(true);
-    // delog((microtime(true) - $time_start), 'Lorem ipsum');
- ?><!DOCTYPE html>
+<!DOCTYPE html>
 <html <?php language_attributes(); ?> class="no-js">
 <head>
     <meta charset="<?php bloginfo( 'charset' ); ?>">
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible" />
+    <meta content="IE=edge" http-equiv="X-UA-Compatible" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title><?php wp_title(''); ?> | Biuro</title>
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
@@ -31,7 +27,7 @@
     <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-500.woff2" crossorigin="anonymous" >
     <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2" crossorigin="anonymous" >
 
-    <style><?php include 'css/core-c844a271cc.min.css'; ?></style>
+    <style><?php include 'css/core-0cdb3b2c07.min.css'; ?></style>
 
     <script>
         document.documentElement.classList.replace('no-js', 'js');
@@ -40,13 +36,13 @@
     <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-300.woff2" crossorigin="anonymous" >
     <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2" crossorigin="anonymous" >
 
-    <link rel="preload" href="/wp-content/themes/biuro/css/main-7c323da9f9.min.css" as="style" onload="this.rel='stylesheet'">
+    <link rel="preload" href="/wp-content/themes/biuro/css/main-d24fbfd883.min.css" as="style" onload="this.rel='stylesheet'">
 
     <link rel="preconnect" href="https://www.gstatic.com">
     <link rel="preconnect" href="https://fonts.gstatic.com">
 
     <noscript>
-        <link rel="stylesheet" href="/wp-content/themes/biuro/css/main-7c323da9f9.min.css">
+        <link rel="stylesheet" href="/wp-content/themes/biuro/css/main-d24fbfd883.min.css">
     </noscript>
 
     <?php wp_head(); ?>

wp-content/themes/biuro/header.php

-<?php
-    // global $time_start;
-    // $time_start = microtime(true);
-    // delog((microtime(true) - $time_start), 'Lorem ipsum');
- ?><!DOCTYPE html>
+<!DOCTYPE html>
 <html <?php language_attributes(); ?> class="no-js">
 <head>
     <meta charset="<?php bloginfo( 'charset' ); ?>">
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible" />
+    <meta content="IE=edge" http-equiv="X-UA-Compatible" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title><?php wp_title(''); ?> | Biuro</title>
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
@@ -31,7 +27,7 @@
     <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-500.woff2" crossorigin="anonymous" >
     <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2" crossorigin="anonymous" >
 
-    <style><?php include 'css/core-c844a271cc.min.css'; ?></style>
+    <style><?php include 'css/core-0cdb3b2c07.min.css'; ?></style>
 
     <script>
         document.documentElement.classList.replace('no-js', 'js');
@@ -40,13 +36,13 @@
     <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-300.woff2" crossorigin="anonymous" >
     <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2" crossorigin="anonymous" >
 
-    <link rel="preload" href="/wp-content/themes/biuro/css/main-7c323da9f9.min.css" as="style" onload="this.rel='stylesheet'">
+    <link rel="preload" href="/wp-content/themes/biuro/css/main-d24fbfd883.min.css" as="style" onload="this.rel='stylesheet'">
 
     <link rel="preconnect" href="https://www.gstatic.com">
     <link rel="preconnect" href="https://fonts.gstatic.com">
 
     <noscript>
-        <link rel="stylesheet" href="/wp-content/themes/biuro/css/main-7c323da9f9.min.css">
+        <link rel="stylesheet" href="/wp-content/themes/biuro/css/main-d24fbfd883.min.css">
     </noscript>
 
     <?php wp_head(); ?>
@@ -77,7 +73,7 @@
                 </nav>
 <?php
                 $blogID = get_current_blog_id();
-                $inEmployers = get_post_meta( $post->ID, 'section', true) == 'employers';
+                $inEmployers = (is_page() && get_post_meta( $post->ID, 'section', true) == 'employers') ? true : false;
 
                 $phone = '+37064902392';
                 $phoneUI = '+370 649 02392';
@@ -147,7 +143,7 @@
 <?php
                 get_template_part( 'template-parts/menus/menu', 'language' );
 ?>
-                </div><!-- .c-nav--lang-wrap -->
+                </div>
 
                 <span class="js-toggle--nav l-nav--close">
                     <svg width="13px" height="13px">
@@ -155,6 +151,6 @@
                     </svg>
                 </span>
 
-            </div><!-- .l-nav--wrap -->
+            </div>
         </div>
     </header>

wp-content/themes/biuro/sales-page.php

@@ -84,7 +84,7 @@
                         ?>
                     </div>
 
-                </div><!-- .c-contact--inner -->
+                </div>
             </div><!-- .c-contact -->
 
         </main><!-- .l-main -->

wp-content/themes/biuro/search.php

@@ -83,7 +83,7 @@ get_header(); ?>
 
         if ( $searchQuery ) :
 
-            if ( $searchQuery['city'] ) :
+            if ( isset($searchQuery['city']) ) :
                 $city = get_term_by( 'name', preg_replace('/[\+]/', ' ', $searchQuery['city']), 'city' );
 
                 if ( $city ) :
@@ -91,7 +91,7 @@ get_header(); ?>
                 endif;
             endif;
 
-            if ( $searchQuery['s'] ) :
+            if ( isset($searchQuery['s']) ) :
 
                 $field = get_term_by( 'name', preg_replace('/[\+]/', ' ', $searchQuery['s']), 'field' );
                 $type = get_term_by( 'name', preg_replace('/[\+]/', ' ', $searchQuery['s']), 'type' );

wp-content/themes/biuro/searchform.php

@@ -31,7 +31,7 @@ $langID = $langs[pll_current_language('slug')]['id'];
 ?>
 <form id="search" class="c-search" action="<?php echo home_url(); ?>" method="get">
 
-    <div for="search-city" class="c-search--col c-search--col-location">
+    <label for="search-city" class="c-search--col c-search--col-location">
         <svg xmlns="http://www.w3.org/2000/svg" width="15px" height="21px" viewBox="0 0 15 21" class="c-ico--location">
             <path fill="#B8BCC1" d="M7.5,4.25c2.068,0,3.75,1.682,3.75,3.75s-1.682,3.75-3.75,3.75S3.75,10.068,3.75,8 S5.432,4.25,7.5,4.25z M7.5,10.5C8.878,10.5,10,9.379,10,8S8.878,5.5,7.5,5.5C6.121,5.5,5,6.622,5,8C5,9.379,6.121,10.5,7.5,10.5z M7.5,0.5C11.642,0.5,15,3.858,15,8c0,3.024-1.054,3.868-6.729,12.096c-0.373,0.538-1.169,0.538-1.542,0C1.054,11.868,0,11.024,0,8 C0,3.858,3.358,0.5,7.5,0.5z M7.5,19.013c5.442-7.87,6.25-8.494,6.25-11.013c0-1.669-0.65-3.239-1.831-4.419 C10.739,2.4,9.169,1.75,7.5,1.75S4.261,2.4,3.081,3.581C1.9,4.761,1.25,6.331,1.25,8C1.25,10.519,2.059,11.144,7.5,19.013z"/>
         </svg>
@@ -58,9 +58,9 @@ $langID = $langs[pll_current_language('slug')]['id'];
                 <use xlink:href="#ico--up"></use>
             </svg>
         </span>
-    </div><!-- .c-search--col c-search--col-location -->
+    </label>
 
-    <div for="search-query" class="c-search--col c-search--col-keyword">
+    <label for="search-query" class="c-search--col c-search--col-keyword">
         <svg xmlns="http://www.w3.org/2000/svg" width="20px" height="19px" viewBox="0 0 20 19" class="c-ico--area">
             <path fill="#B8BCC1" d="M18.125,4.5C19.16,4.5,20,5.339,20,6.375v10c0,1.036-0.839,1.875-1.875,1.875H1.875 C0.839,18.25,0,17.411,0,16.375v-10C0,5.339,0.839,4.5,1.875,4.5H6.25V1.688c0-0.518,0.42-0.937,0.937-0.937h5.625 c0.518,0,0.938,0.42,0.938,0.937V4.5H18.125z M7.5,2v2.5h5V2H7.5z M18.75,16.375V10.75H12.5v1.562c0,0.518-0.42,0.937-0.938,0.937 H8.437c-0.518,0-0.938-0.42-0.938-0.937V10.75H1.25v5.625C1.25,16.72,1.53,17,1.875,17h16.25C18.47,17,18.75,16.72,18.75,16.375z M8.75,12h2.5v-1.25h-2.5V12z M18.75,9.5V6.375c0-0.345-0.28-0.625-0.625-0.625H1.875C1.53,5.75,1.25,6.03,1.25,6.375V9.5H18.75z"/>
         </svg>
@@ -88,7 +88,7 @@ $langID = $langs[pll_current_language('slug')]['id'];
                 <use xlink:href="#ico--up"></use>
             </svg>
         </span>
-    </div><!-- .c-search--col c-search--col-keyword -->
+    </label>
     <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">
             <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"/>

wp-content/themes/biuro/single-job.php

@@ -70,14 +70,15 @@ get_header();
             'pageURL' => '',
         );
 
-        $terms = get_post_meta($ID, "_yoast_wpseo_primary_{$str}");
+        $termID = get_post_meta($ID, "_yoast_wpseo_primary_{$str}", true);
 
-        if (isset($terms) && isset($terms[0])) {
+        if (isset($termID)) {
             $pages = getOptions($str);
-            $termID = $terms[0];
 
             $options = array_filter($pages, function ($pages) use ($termID) { return ($pages['termID'] == $termID); } );
 
+            if (count($options) > 0):
+
                 foreach ($options as &$page) :
                     if (isset($page['name'])):
                         $res['name'] = $page['name'];
@@ -89,6 +90,17 @@ get_header();
                         $res['pageURL'] = ($str == 'city') ? '/?city=' . $res['name'] . '&s=' : '/?city=&s=' . $res['name'];
                     endif;
                 endforeach;
+
+            else:
+
+                $page = get_term_meta( $termID, 'page-id', true);
+
+                if (isset($page)):
+                    $res['name'] = $page['post_title'];
+                    $res['pageURL'] = get_page_link( $page['ID'] );
+                endif;
+
+            endif;
         }
 
         return $res;
@@ -159,9 +171,7 @@ get_header();
 
             if ($field['name'] != ''):
                 if ($city['name'] != ''):
-?>
-                <li class="c-categories--sep">/</li>
-<?php
+                    echo '<li class="c-categories--sep">/</li>';
                 endif;
 ?>
                 <li>
@@ -247,6 +257,8 @@ get_header();
 ?>             </div>
 <?php
 
+                if (!$pod->field( 'hide-salary' )):
+
                     echo '<b>' . __('Salary', 'biuro') . ':</b> ';
 
                     if ($pod->field( 'salary_from' ) > 0):
@@ -260,6 +272,8 @@ get_header();
                     _e('(neto)', 'biuro');
 
                 endif;
+
+            endif;
         endif;
 
         if ( is_active_sidebar( 'hiring_organization' ) ) :
@@ -304,7 +318,7 @@ get_header();
 ?>
         </aside><!-- .l-aside -->
 
-    </div><!-- .l-content--position-inner -->
+    </div><!-- .l-content -position-inner -->
 
 </div><!-- #content -->
 

wp-content/themes/biuro/style.css

@@ -3,6 +3,6 @@ Theme Name: Biuro
 Author: Biuro
 Author URI: https://www.biuro.lt/
 Description: Biuro multiregion theme
-Version: 1.12.1
+Version: 1.12.2
 Text Domain: biuro
 */

wp-content/themes/biuro/template-parts/jobs/jobs-list.php

@@ -35,7 +35,7 @@ function showPosted($published, $valid) {
 
 ?>
 
-    <table cellspacing="0" cellpadding="0" class="c-jobs--table">
+    <table class="c-jobs--table">
     <?php
         while ( $jobs->fetch() ) :
             $ID =  $jobs->display( 'ID' );

wp-content/themes/biuro/template-parts/layout/aside-job.php

@@ -31,13 +31,6 @@
     <symbol id="ico--job-copy" viewBox="0 0 15 18">
         <path fill="#FFFFFF" d="M10.687,15v1.328c0,0.44-0.357,0.797-0.797,0.797H0.859c-0.44,0-0.797-0.357-0.797-0.797V4.109 c0-0.44,0.357-0.797,0.797-0.797H3.25v9.828C3.25,14.166,4.084,15,5.109,15H10.687z M10.687,3.578c0,0.438,0.359,0.797,0.797,0.797 h3.453v8.766c0,0.44-0.357,0.797-0.797,0.797H5.109c-0.44,0-0.797-0.357-0.797-0.797V0.922c0-0.44,0.357-0.797,0.797-0.797h5.578 V3.578z M14.704,2.548c0.129,0.129,0.233,0.381,0.233,0.563v0.201H11.75V0.125h0.201c0.182,0,0.435,0.105,0.563,0.233L14.704,2.548z "/>
     </symbol>
-<?php
-/*
-    <symbol id="ico--phone" viewBox="0 0 19 20">
-        <path fill="#2A3644" d="M18.102,1.269C18.629,1.388,19,1.856,19,2.398c0,9.4-7.619,16.977-16.977,16.977 c-0.542,0-1.009-0.371-1.132-0.902L0.03,14.736c-0.126-0.546,0.156-1.102,0.672-1.325l4.023-1.726 c0.471-0.204,1.028-0.067,1.354,0.33l1.637,2c2.572-1.262,4.661-3.355,5.923-5.923l-2-1.636c-0.397-0.327-0.534-0.883-0.33-1.354 l1.726-4.026c0.223-0.516,0.783-0.798,1.328-0.672L18.102,1.269z M2.045,18.188c8.702-0.011,15.757-7.062,15.764-15.764L14.113,1.57 l-1.707,3.986l2.702,2.208c-1.796,3.83-3.878,5.919-7.722,7.722l-2.208-2.702l-3.986,1.707L2.045,18.188z"/>
-    </symbol>
-*/
- ?>
     <symbol id="ico--email"  viewBox="0 0 20 15">
         <path fill="#2A3644" d="M17.641,0.75c0.983,0,1.781,0.798,1.781,1.781v10.688c0,0.983-0.798,1.781-1.781,1.781H2.203 c-0.983,0-1.781-0.798-1.781-1.781V2.531c0-0.983,0.798-1.781,1.781-1.781H17.641z M2.203,1.938c-0.327,0-0.594,0.267-0.594,0.594 v1.536C2.422,4.754,3.584,5.7,7.198,8.569c0.623,0.497,1.863,1.696,2.724,1.681c0.861,0.015,2.097-1.184,2.724-1.681 c3.614-2.869,4.776-3.815,5.589-4.501V2.531c0-0.327-0.267-0.594-0.594-0.594H2.203z M17.641,13.813 c0.327,0,0.594-0.267,0.594-0.594V5.611c-0.846,0.694-2.182,1.766-4.85,3.885c-0.779,0.623-2.112,1.952-3.462,1.941 C8.564,11.445,7.22,10.105,6.46,9.497c-2.668-2.119-4.004-3.191-4.85-3.885v7.607c0,0.327,0.267,0.594,0.594,0.594H17.641z"/>
     </symbol>

wp-content/themes/biuro/template-parts/menus/menu-main.php

@@ -18,11 +18,10 @@
             return false;
         endif;
 
-        if ($childID == $ID):
-            return true;
-        endif;
+        return ($childID == $ID) ? true : false;
 
-        return ( get_post_meta( $childID, 'page', true ) == "employees-contacts" && pods( 'division' )->find( array( 'limit' => 1, 'where'=>"page-id.ID = " . $ID ) )->total() ) ? true : false;
+        // used to be used for Contacts sub pages
+        // return ( get_post_meta( $childID, 'page', true ) == "employees-contacts" && pods( 'division' )->find( array( 'limit' => 1, 'where'=>"page-id.ID = " . $ID ) )->total() ) ? true : false;
     }
 
     foreach( $menu_items as $menu_item ):
@@ -40,12 +39,14 @@
         endif;
     endforeach;
 
+    global $post;
+
     $main .= '<ul class="o-nav c-nav--main">';
     foreach($items as $item) :
         $children = array_key_exists('children', $item);
         $url = ($children) ? $item['children'][0]->url : $item['props']->url;
 
-        $sectionCSS = ( get_post_meta( $post->ID, 'section', true) == get_post_meta( $item['props']->object_id, 'section', true )) ? 'is-nav--main-item-active' : '';
+        $sectionCSS = (is_page() && get_post_meta( $post->ID, 'section', true) == get_post_meta( $item['props']->object_id, 'section', true )) ? 'is-nav--main-item-active' : '';
         $main .= '<li class="c-nav--main-item ' . $sectionCSS . '">';
 
         $classCSS = ($item['active']) ? 'is-nav--main-anchor-active' : '';

wp-content/themes/biuro/template-parts/meta/canonical.php

@@ -10,7 +10,7 @@ wp_parse_str( $query_string, $searchQuery );
 
 if ( is_search()) :
 
-    if ( $searchQuery['city'] && !$searchQuery['s'] ) :
+    if ( isset($searchQuery['city']) && !isset($searchQuery['s']) ) :
         $term = get_term_by( 'name', $searchQuery['city'], 'city' );
 
         if ( $term ) :
@@ -24,7 +24,7 @@ if ( is_search()) :
             endif;
         endif;
 
-    elseif ( !$searchQuery['city'] && $searchQuery['s'] ) :
+    elseif ( !isset($searchQuery['city']) && isset($searchQuery['s']) ) :
 
         $term = get_term_by( 'name', $searchQuery['s'], 'field' );
 
@@ -44,7 +44,7 @@ if ( is_search()) :
 
         endif;
 
-    elseif ( !$searchQuery['city'] || !$searchQuery['s'] ) :
+    elseif ( !isset($searchQuery['city']) || !isset($searchQuery['s']) ) :
         ?>
         <meta name="robots" content="noindex" />
         <?php

wp-init.sh

 # !/usr/bin/env sh
-sleep 120;
+sleep 15;
 echo "WP CLI init";
 
 wp core update --force;