Commit 9f512648 authored by Simonas's avatar Simonas

release 1.12.2

parent 50682137
...@@ -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: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` - 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 ## Production
- update biuro/web image version in .env file (staging or www) - update biuro/web image version in .env file (staging or www)
......
{ {
"name": "biuro", "name": "biuro",
"version": "1.12.1", "version": "1.12.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
......
{ {
"name": "biuro", "name": "biuro",
"version": "1.12.1", "version": "1.12.2",
"description": "Biuro WP theme", "description": "Biuro WP theme",
"scripts": { "scripts": {
"dev": "gulp --require @babel/register --gulpfile tasks", "dev": "gulp --require @babel/register --gulpfile tasks",
......
...@@ -50,6 +50,10 @@ ...@@ -50,6 +50,10 @@
} }
} }
[href="https://maps.google.com/?q="] {
display: none !important;
}
/* critical:end */ /* critical:end */
.c-job-facebook { max-width: 320px; margin: 0 auto; overflow: hidden; .c-job-facebook { max-width: 320px; margin: 0 auto; overflow: hidden;
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<?php <?php
endif; endif;
?> ?>
<script src="/wp-content/themes/biuro/js/main.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> <script src="/wp-content/themes/biuro/js/vendor/modernizr-custom.js" async></script>
<?php <?php
......
...@@ -939,8 +939,6 @@ function getResults($taxonomy, $term = '', $termID = '', $langID = '') { ...@@ -939,8 +939,6 @@ function getResults($taxonomy, $term = '', $termID = '', $langID = '') {
$today = date('Y-m-d'); $today = date('Y-m-d');
$order = ($taxonomy == 'city') ? 'no DESC' : 'total DESC'; $order = ($taxonomy == 'city') ? 'no DESC' : 'total DESC';
$langID = 2;
$condition = ($term && $termID) ? " AND `" . $term . "`.`term_id` = " . $termID : ''; $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` $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` 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`
......
...@@ -27,7 +27,7 @@ ...@@ -27,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-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" > <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.min.css'; ?></style> <style><?php include 'css/core-0cdb3b2c07.min.css'; ?></style>
<script> <script>
document.documentElement.classList.replace('no-js', 'js'); document.documentElement.classList.replace('no-js', 'js');
...@@ -36,13 +36,13 @@ ...@@ -36,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-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" 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.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://www.gstatic.com">
<link rel="preconnect" href="https://fonts.gstatic.com"> <link rel="preconnect" href="https://fonts.gstatic.com">
<noscript> <noscript>
<link rel="stylesheet" href="/wp-content/themes/biuro/css/main.min.css"> <link rel="stylesheet" href="/wp-content/themes/biuro/css/main-d24fbfd883.min.css">
</noscript> </noscript>
<?php wp_head(); ?> <?php wp_head(); ?>
......
...@@ -27,7 +27,7 @@ ...@@ -27,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-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" > <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.min.css'; ?></style> <style><?php include 'css/core-0cdb3b2c07.min.css'; ?></style>
<script> <script>
document.documentElement.classList.replace('no-js', 'js'); document.documentElement.classList.replace('no-js', 'js');
...@@ -36,13 +36,13 @@ ...@@ -36,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-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" 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.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://www.gstatic.com">
<link rel="preconnect" href="https://fonts.gstatic.com"> <link rel="preconnect" href="https://fonts.gstatic.com">
<noscript> <noscript>
<link rel="stylesheet" href="/wp-content/themes/biuro/css/main.min.css"> <link rel="stylesheet" href="/wp-content/themes/biuro/css/main-d24fbfd883.min.css">
</noscript> </noscript>
<?php wp_head(); ?> <?php wp_head(); ?>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -70,25 +70,37 @@ get_header(); ...@@ -70,25 +70,37 @@ get_header();
'pageURL' => '', '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); $pages = getOptions($str);
$termID = $terms[0];
$options = array_filter($pages, function ($pages) use ($termID) { return ($pages['termID'] == $termID); } ); $options = array_filter($pages, function ($pages) use ($termID) { return ($pages['termID'] == $termID); } );
foreach ($options as &$page) : if (count($options) > 0):
if (isset($page['name'])):
$res['name'] = $page['name']; foreach ($options as &$page) :
endif; if (isset($page['name'])):
$res['name'] = $page['name'];
endif;
if (isset($page['pageID'])):
$res['pageURL'] = get_page_link( $page['pageID'] );
else:
$res['pageURL'] = ($str == 'city') ? '/?city=' . $res['name'] . '&s=' : '/?city=&s=' . $res['name'];
endif;
endforeach;
else:
if (isset($page['pageID'])): $page = get_term_meta( $termID, 'page-id', true);
$res['pageURL'] = get_page_link( $page['pageID'] );
else: if (isset($page)):
$res['pageURL'] = ($str == 'city') ? '/?city=' . $res['name'] . '&s=' : '/?city=&s=' . $res['name']; $res['name'] = $page['post_title'];
$res['pageURL'] = get_page_link( $page['ID'] );
endif; endif;
endforeach;
endif;
} }
return $res; return $res;
...@@ -159,9 +171,7 @@ get_header(); ...@@ -159,9 +171,7 @@ get_header();
if ($field['name'] != ''): if ($field['name'] != ''):
if ($city['name'] != ''): if ($city['name'] != ''):
?> echo '<li class="c-categories--sep">/</li>';
<li class="c-categories--sep">/</li>
<?php
endif; endif;
?> ?>
<li> <li>
......
...@@ -3,6 +3,6 @@ Theme Name: Biuro ...@@ -3,6 +3,6 @@ Theme Name: Biuro
Author: Biuro Author: Biuro
Author URI: https://www.biuro.lt/ Author URI: https://www.biuro.lt/
Description: Biuro multiregion theme Description: Biuro multiregion theme
Version: 1.12.1 Version: 1.12.2
Text Domain: biuro Text Domain: biuro
*/ */
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