Skip to content

D
dev.biuro
Commit 20eed29d authored by Simonas's avatar Simonas
Browse files
Options

UI changes

parent 768ef78f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 1077 deletions
README.md
View file @ 20eed29d
......@@ -103,10 +103,10 @@ Restart docker (sometimes PC restart may be required)
- docker load --input ourdemo.tar
- docker build -t biuro/web:0.0.5 .
- docker build -t biuro/web:0.0.7 .
- docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs
- sudo docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs
- docker push biuro/web:0.0.5
- docker push biuro/web:0.0.7
- sudo chown -R www-data:www-data wordpress/wp-content/plugins
......
wp-content/plugins/biuro-feedbacks/biuro-feedbacks.php
View file @ 20eed29d
......@@ -59,11 +59,11 @@ class Biuro_Feedbacks extends WP_Widget {
?>
<p>
<label for="<?php echo esc_attr( $this->get_field_id( 'name' . $i ) ); ?>"><?php _e( 'Name', 'biuro' ); ?><?php echo ' ' . $i . ':'; ?></label>
<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'name' . $i ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'name' . $i ) ); ?>" type="text" name="<?php echo esc_attr( ${'name' . $i} ); ?>" />
<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'name' . $i ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'name' . $i ) ); ?>" type="text" value="<?php echo esc_attr( ${'name' . $i} ); ?>" />
</p>
<p>
<label for="<?php echo esc_attr( $this->get_field_id( 'img' . $i ) ); ?>"><?php _e( 'Image', 'biuro' ); ?><?php echo ' ' . $i . ':'; ?></label>
<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'img' . $i ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'img' . $i ) ); ?>" type="text" name="<?php echo esc_attr( ${'img' . $i} ); ?>" />
<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'img' . $i ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'img' . $i ) ); ?>" type="text" value="<?php echo esc_attr( ${'img' . $i} ); ?>" />
</p>
<p>
<label for="<?php echo esc_attr( $this->get_field_id( 'feedback' . $i ) ); ?>"><?php _e( 'Feedback', 'biuro' ); ?><?php echo ' ' . $i . ':'; ?></label>
......@@ -104,12 +104,21 @@ class Biuro_Feedbacks extends WP_Widget {
echo '<div class="c-biuro-feedbacks">';
for ($i = 1; $i <= 8; $i++):
if ( ${'name' . $i} ) {
echo '<h3>' . ${'name' . $i} . ${'img' . $i} . '</h3>';
}
if ( ${'feedback' . $i} ) {
echo '<p>' . ${'feedback' . $i} . '</p>';
}
if ( ${'name' . $i} != "" && ${'feedback' . $i} != ""):
echo '<div class="c-biuro-feedbacks--item">';
if ( ${'name' . $i} != "" ) {
echo '<h3>' . ${'name' . $i} . ${'img' . $i} . '</h3>';
}
if ( ${'feedback' . $i} != "" ) {
echo '<p>' . ${'feedback' . $i} . '</p>';
}
echo '</div>';
endif;
endfor;
echo '</div>';
......
wp-content/plugins/biuro-html/biuro-html.php
View file @ 20eed29d
......@@ -64,11 +64,11 @@ class Biuro_HTML extends WP_Widget {
// echo '<div class="c-biuro-html">';
// Display content field
if ( $title ) {
if ( $title != "" ) {
echo '<h3>' . $title . '</h3>';
}
if ( $content ) {
if ( $content != "" ) {
echo $content;
}
......
wp-content/plugins/biuro-sections/biuro-sections.php
View file @ 20eed29d
......@@ -120,15 +120,23 @@ class Biuro_Sections extends WP_Widget {
echo '<div class="c-biuro-sections">';
for ($i = 1; $i <= 8; $i++):
if ( ${'title' . $i} ) {
echo '<h3>' . ${'title' . $i} . ' (img: ' . ${'img' . $i} . ')</h3>';
}
if ( ${'description' . $i} ) {
echo '<div>' . ${'description' . $i} . '</div>';
}
if ( ${'content' . $i} ) {
echo '<div>' . ${'content' . $i} . '</div>';
}
if ( ${'title' . $i} != "" && ${'description' . $i} != ""&& ${'content' . $i} != ""):
echo '<div class="c-biuro-sections--item">';
if ( ${'title' . $i} != "" ) {
echo '<h3>' . ${'title' . $i} . ' (img: ' . ${'img' . $i} . ')</h3>';
}
if ( ${'description' . $i} != "" ) {
echo '<div>' . ${'description' . $i} . '</div>';
}
if ( ${'content' . $i} != "" ) {
echo '<div>' . ${'content' . $i} . '</div>';
}
echo '</div>';
endif;
endfor;
echo '</div>';
......
wp-content/plugins/biuro-services/biuro-services.php
View file @ 20eed29d
......@@ -104,12 +104,22 @@ class Biuro_Services extends WP_Widget {
echo '<div class="c-biuro-services">';
for ($i = 1; $i <= 8; $i++):
if ( ${'title' . $i} ) {
echo '<h3>' . ${'title' . $i} . ${'position' . $i} . '</h3>';
}
if ( ${'content' . $i} ) {
echo '<p>' . ${'content' . $i} . '</p>';
}
if ( ${'title' . $i} != "" && ${'content' . $i} != ""):
echo '<div class="c-biuro-services--item">';
if ( ${'title' . $i} != "" ) {
echo '<h3 style="margin: 0; text-align: center;">' . ${'title' . $i} . '</h3>';
}
if ( ${'position' . $i} != "" ) {
echo '<h4 style="margin: 3px 0; text-align: center;">' . ${'position' . $i} . '</h4>';
}
if ( ${'content' . $i} != "" ) {
echo '<div>' . ${'content' . $i} . '</div>';
}
echo '</div>';
endif;
endfor;
echo '</div>';
......
wp-content/plugins/biuro-values/biuro-values.php
View file @ 20eed29d
......@@ -90,16 +90,24 @@ class Biuro_Values extends WP_Widget {
echo '<div class="c-biuro-values">';
for ($i = 1; $i <= 8; $i++):
if ( ${'value' . $i} ) {
echo '<h3>' . ${'value' . $i} . '</h3>';
}
if ( ${'content' . $i} ) {
echo '<p>' . ${'content' . $i} . '</p>';
}
if ( ${'value' . $i} != "" && ${'content' . $i} != ""):
echo '<div class="c-biuro-values--item">';
if ( ${'value' . $i} != "" ) {
echo '<h3 style="margin: 0">' . ${'value' . $i} . '</h3>';
}
if ( ${'content' . $i} != "" ) {
echo '<p>' . ${'content' . $i} . '</p>';
}
echo '</div>';
endif;
endfor;
echo '</div>';
// WordPress core after_widget hook (always include )
echo $after_widget;
}
......
wp-content/plugins/jobs-importer/JobsImporter.php
View file @ 20eed29d
......@@ -110,6 +110,7 @@ class JobsImporter
$podId = $pod->save($adData);
// Set post language
$this->setPostLang($podId, $ad['lang']);
print_r("Job ID: <b>$podId</b> <br>");
print_r("Old record ($this->primaryKey: $primaryKey) has been updated. <br>");
} catch (Exception $e) {
......
wp-content/plugins/jobs-importer/JsonDataCollector.php
View file @ 20eed29d
......@@ -171,7 +171,7 @@ class JsonDataCollector
foreach ($appends as $propertyKey => $propertyValues) {
if (isset($ad->{$propertyKey})) {
if (isset($ad->{$propertyKey}) && !empty($ad->{$propertyKey})) {
foreach ($ad->{$propertyKey} as $data) {
$result[$termKey][] = $this->getEntity($data, $propertyValues);
}
......@@ -222,4 +222,4 @@ class JsonDataCollector
{
return (is_array($value)) ? $value : html_entity_decode($value);
}
}
\ No newline at end of file
}
wp-content/themes/biuro/css/core-a25434ed1d.min.css 0 → 100644
View file @ 20eed29d
:root{--color--gray:#4d4d4d;--color--green:#006957;--typo--font-family:-apple-system,BlinkMacSystemFont,"Segoe UI Light","Roboto","Oxygen","Ubuntu","Cantarell","Fira Sans","Droid Sans","Helvetica Neue",sans-serif;--typo--font-size:1.8rem;--typo--weight-slim:100;--typo--weight-regular:400;--typo--weight-bold:600;--typo--line-height:1.2;--typo--font-face:"PT Sans Narrow",sans-serif;--typo--font-face-additional:"Bebas Neue",sans-serif;--layout-width:63em}html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}html{-webkit-box-sizing:border-box;box-sizing:border-box}*,:after,:before{-webkit-box-sizing:inherit;box-sizing:inherit}a,body{color:#4d4d4d;color:var(--color--gray)}body{font-size:1.8rem;font-size:var(--typo--font-size);line-height:1.2;line-height:var(--typo--line-height)}html{min-height:100%;font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}.l-content,.l-footer,.l-header,.l-inner{max-width:63em;max-width:var(--layout-width);margin-right:auto;margin-left:auto;padding-right:1em;padding-left:1em}.l-header{padding-top:15px;padding-bottom:15px}.o-nav{margin:0;padding:0;list-style:none}.c-cookies-warning{display:none}.c-data-controller{padding:0 1em;text-align:center;font-size:88%}.c-data-controller p{margin-bottom:0}.c-jobs-list{width:100%;margin:0 0 20px}.c-jobs-list--head{padding:10px}.c-jobs-list--col{padding:0 10px}.c-logo--svg{display:block}.c-nav--main{display:-webkit-box;display:-ms-flexbox;display:flex}.c-nav--sub,.u-hidden{display:none}@media (min-width:48em){:root{--typo--font-size:1.6rem;--typo--line-height:1.3}body{font-family:PT Sans Narrow,sans-serif;font-family:var(--typo--font-face)}.l-header{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.l-content,.l-header{display:-webkit-box;display:-ms-flexbox;display:flex}.l-aside{-webkit-box-flex:0;-ms-flex:0 0 16.25em;flex:0 0 16.25em}.l-main,.l-nav{-webkit-box-flex:1;-ms-flex:1 1 100%;flex:1 1 100%}.c-nav--main{padding-left:2em}}@media (max-width:47.999em){body{font-family:-apple-system,BlinkMacSystemFont,Segoe UI Light,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;font-family:var(--typo--font-family);letter-spacing:-.08rem}.c-nav--main{margin:20px 0}}@media (min-width:30em){.c-jobs-list--col{padding:10px}}@media (max-width:29.999em){.c-jobs-list--col-position{padding-top:10px}}
\ No newline at end of file
wp-content/themes/biuro/css/core.min.css deleted 100644 → 0
View file @ 768ef78f
This diff is collapsed.
wp-content/themes/biuro/css/main.css
View file @ 20eed29d
......@@ -54,3 +54,13 @@ qa-: Signify that a QA or Test Engineering team is running an automated UI test
}
.biuro-ti-img { display: none; }
.c-biuro-feedbacks { display: flex; flex-wrap: wrap; }
.c-biuro-feedbacks--item { flex: 1 0 40%; margin: 5px; border: 1px solid #888; }
.c-biuro-sections { display: flex; flex-wrap: wrap; }
.c-biuro-sections--item { flex: 1 0 20%; margin: 5px; border: 1px solid #888; text-align: center;}
.c-biuro-services { display: flex; flex-wrap: wrap; }
.c-biuro-services--item { flex: 1 0 30%; margin: 5px; border: 1px solid #888; }
.c-biuro-values { display: flex; flex-wrap: wrap; }
.c-biuro-values--item { flex: 1 0 40%; margin: 5px; border: 1px solid #888; }
wp-content/themes/biuro/css/main.min.css.map deleted 100644 → 0
View file @ 768ef78f
This diff is collapsed.
wp-content/themes/biuro/footer.php
View file @ 20eed29d
......@@ -123,7 +123,7 @@ document.querySelectorAll('.js-job-action').forEach(function (node) {
});
</script>
<script src="/wp-content/themes/biuro/js/main.min.js" async></script>
<script src="/wp-content/themes/biuro/js/main-a9a206ea.min.js" async></script>
<?php wp_footer(); ?>
</body>
</html>
wp-content/themes/biuro/front-page.php
View file @ 20eed29d
......@@ -57,6 +57,16 @@
<br>
<?php
if ( is_active_sidebar( 'front_page_feedbacks' ) ) :
dynamic_sidebar( 'front_page_feedbacks' );
endif;
?>
<br>
<?php
if ( is_active_sidebar( 'front_page_values' ) ) :
dynamic_sidebar( 'front_page_values' );
......
wp-content/themes/biuro/header.php
View file @ 20eed29d
......@@ -31,16 +31,16 @@ define('cityID', $cityID);
get_template_part( 'template-parts/meta/canonical');
?>
<style><?php include 'css/core.min.css'; ?></style>
<style><?php include 'css/core-a25434ed1d.min.css'; ?></style>
<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-e48562fc43.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_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>
<noscript>
<link rel="stylesheet" href="/wp-content/themes/biuro/css/main.min.css">
<link rel="stylesheet" href="/wp-content/themes/biuro/css/main-e48562fc43.min.css">
</noscript>
<?php wp_head(); ?>
......
wp-content/themes/biuro/js/main-a9a206ea.min.js 0 → 100644
View file @ 20eed29d
This diff is collapsed.
wp-content/themes/biuro/js/main.min.js deleted 100644 → 0
View file @ 768ef78f
This source diff could not be displayed because it is too large. You can view the blob instead.
wp-content/themes/biuro/sales-page.php
View file @ 20eed29d
......@@ -42,7 +42,6 @@
endif;
?>
<div style="border: 1px solid orange;">
<h2 style="color:; red">Sektoriai</h2>
<?php
......@@ -50,7 +49,6 @@
dynamic_sidebar( 'sales_page_sections' );
endif;
?>
</div>
<br>
......@@ -67,15 +65,14 @@
<br>
<div style="border: 1px solid grey;">
<h2 style="color:; red">Atsiliepimai</h2>
<h2 style="color:; red">Atsiliepimai</h2>
<?php
if ( is_active_sidebar( 'sales_page_feedbacks' ) ) :
dynamic_sidebar( 'sales_page_feedbacks' );
endif;
?>
<?php
if ( is_active_sidebar( 'sales_page_feedbacks' ) ) :
dynamic_sidebar( 'sales_page_feedbacks' );
endif;
?>
</div>
<br>
......
wp-init.sh
View file @ 20eed29d
......@@ -50,7 +50,7 @@ wp plugin activate biuro-values --network
wp plugin activate cookies-warning --network
wp plugin activate data-controller --network
# wp plugin activate jobs-importer
# wp plugin activate jobs-importer --network
# WP themes
wp theme update --all
......
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