diff --git a/plugins/tps/reklama/components/advertisement/slider.htm b/plugins/tps/reklama/components/advertisement/slider.htm index e91638f6b..06b1c0da0 100644 --- a/plugins/tps/reklama/components/advertisement/slider.htm +++ b/plugins/tps/reklama/components/advertisement/slider.htm @@ -55,7 +55,6 @@ {% else %} {% put scripts %} {% endput %} {% endif %} diff --git a/scripts/category.sql b/scripts/category.sql index d860e0cfa..ac325e677 100644 --- a/scripts/category.sql +++ b/scripts/category.sql @@ -35,23 +35,23 @@ SELECT rb.id, bt.id FROM term_relationships_converted rl Inner JOIN rainlab_blog_categories bt on bt.id = rl.term_taxonomy_id INNER JOIN rainlab_blog_posts rb on rl.object_id = rb.id_ru -update iatm_orient_term_relationships SET term_taxonomy_id = 9 where term_taxonomy_id = 2; -update iatm_orient_term_relationships SET term_taxonomy_id = 8 where term_taxonomy_id = 5; -update iatm_orient_term_relationships SET term_taxonomy_id = 5 where term_taxonomy_id = 3; -update iatm_orient_term_relationships SET term_taxonomy_id = 2508 where term_taxonomy_id = 13; -update iatm_orient_term_relationships SET term_taxonomy_id = 13 where term_taxonomy_id = 10; -update iatm_orient_term_relationships SET term_taxonomy_id = 10 where term_taxonomy_id = 6; -update iatm_orient_term_relationships SET term_taxonomy_id = 2509 where term_taxonomy_id = 11; -update iatm_orient_term_relationships SET term_taxonomy_id = 11 where term_taxonomy_id = 7; -update iatm_orient_term_relationships SET term_taxonomy_id = 6 where term_taxonomy_id = 23; -update iatm_orient_term_relationships SET term_taxonomy_id = 7 where term_taxonomy_id = 26; -update iatm_orient_term_relationships SET term_taxonomy_id = 2510 where term_taxonomy_id = 14; -update iatm_orient_term_relationships SET term_taxonomy_id = 14 where term_taxonomy_id = 29; -update iatm_orient_term_relationships SET term_taxonomy_id = 12 where term_taxonomy_id = 41; -update iatm_orient_term_relationships SET term_taxonomy_id = 2511 where term_taxonomy_id = 793; -update iatm_orient_term_relationships SET term_taxonomy_id = 793 where term_taxonomy_id = 101; -update iatm_orient_term_relationships SET term_taxonomy_id = 2512 where term_taxonomy_id = 621; -update iatm_orient_term_relationships SET term_taxonomy_id = 621 where term_taxonomy_id = 696; +update last_relationships SET term_taxonomy_id = 9 where term_taxonomy_id = 2; +update last_relationships SET term_taxonomy_id = 8 where term_taxonomy_id = 5; +update last_relationships SET term_taxonomy_id = 5 where term_taxonomy_id = 3; +update last_relationships SET term_taxonomy_id = 2508 where term_taxonomy_id = 13; +update last_relationships SET term_taxonomy_id = 13 where term_taxonomy_id = 10; +update last_relationships SET term_taxonomy_id = 10 where term_taxonomy_id = 6; +update last_relationships SET term_taxonomy_id = 2509 where term_taxonomy_id = 11; +update last_relationships SET term_taxonomy_id = 11 where term_taxonomy_id = 7; +update last_relationships SET term_taxonomy_id = 6 where term_taxonomy_id = 23; +update last_relationships SET term_taxonomy_id = 7 where term_taxonomy_id = 26; +update last_relationships SET term_taxonomy_id = 2510 where term_taxonomy_id = 14; +update last_relationships SET term_taxonomy_id = 14 where term_taxonomy_id = 29; +update last_relationships SET term_taxonomy_id = 12 where term_taxonomy_id = 41; +update last_relationships SET term_taxonomy_id = 2511 where term_taxonomy_id = 793; +update last_relationships SET term_taxonomy_id = 793 where term_taxonomy_id = 101; +update last_relationships SET term_taxonomy_id = 2512 where term_taxonomy_id = 621; +update last_relationships SET term_taxonomy_id = 621 where term_taxonomy_id = 696; update iatm_orient_terms SET term_id = 9 where term_id = 2; update iatm_orient_terms SET term_id = 8 where term_id = 5; @@ -83,3 +83,9 @@ INSERT INTO rainlab_blog_posts_categories (post_id,category_id) SELECT rb.id, bt.id FROM `iatm_orient_term_relationships` rl Inner JOIN rainlab_blog_categories bt on bt.id = rl.term_taxonomy_id INNER JOIN rainlab_blog_posts rb on rl.object_id = rb.id_ru and rb.locale='ru' + +update last_relationships_en lr INNER join rainlab_blog_posts rb on lr.object_id = rb.id_en + set lr.object_id = rb.id + +INSERT INTO rainlab_blog_posts_categories (post_id,category_id) +SELECT rl.object_id, rl.term_taxonomy_id FROM last_relationships_en rl where rl.term_taxonomy_id in (SELECT id FROM orient_temp.rainlab_blog_categories) diff --git a/scripts/post.sql b/scripts/post.sql index ecc3dde27..be3a5fdf0 100644 --- a/scripts/post.sql +++ b/scripts/post.sql @@ -56,3 +56,6 @@ where content_html LIKE '%https://orient.tm/en/wp-content/uploads/sites/2/%' UPDATE rainlab_blog_posts set content = replace(content,'storage/app','https://cdn.orient.tm/storage/app'), content_html = REPLACE(content_html,'storage/app','https://cdn.orient.tm/storage/app') where content_html LIKE '%storage/app%' + +UPDATE rainlab_blog_posts set content = replace(content,'http://orient.tm/wp-content/uploads','https://cdn.orient.tm/storage/app/media/ru'), content_html = REPLACE(content_html,'http://orient.tm/wp-content/uploads','https://cdn.orient.tm/storage/app/media/ru') +where content_html LIKE '%http://orient.tm/wp-content/uploads%' diff --git a/scripts/tags.sql b/scripts/tags.sql index cbcd77504..e5a1f8a39 100644 --- a/scripts/tags.sql +++ b/scripts/tags.sql @@ -13,3 +13,9 @@ SELECT bt.id, rb.id FROM `iatm_orient_2_term_relationships` rl where tx.taxonomy = 'post_tag' and bt.locale ='en' ALTER TABLE `bedard_blogtags_tags` ADD UNIQUE `unique_index`(`name`, `locale`); + +DELETE FROM last_relationships WHERE term_taxonomy_id in (SELECT id from orient_temp.rainlab_blog_categories) + +INSERT INTO bedard_blogtags_post_tag (tag_id,post_id) +SELECT bt.id, rl.object_id FROM `last_relationships` rl +INNER JOIN orient_temp.bedard_blogtags_tags bt on bt.id_ru = rl.term_taxonomy_id diff --git a/themes/modern2/assets/images/news/1.png b/themes/modern2/assets/images/news/1.png deleted file mode 100644 index c681bc55b..000000000 Binary files a/themes/modern2/assets/images/news/1.png and /dev/null differ diff --git a/themes/modern2/assets/images/news/2.png b/themes/modern2/assets/images/news/2.png deleted file mode 100644 index 6b4363007..000000000 Binary files a/themes/modern2/assets/images/news/2.png and /dev/null differ diff --git a/themes/modern2/assets/images/news/3.png b/themes/modern2/assets/images/news/3.png deleted file mode 100644 index 1fdf6ab76..000000000 Binary files a/themes/modern2/assets/images/news/3.png and /dev/null differ diff --git a/themes/modern2/pages/post.htm b/themes/modern2/pages/post.htm index b40ce4e60..82bae1a01 100644 --- a/themes/modern2/pages/post.htm +++ b/themes/modern2/pages/post.htm @@ -89,11 +89,6 @@ slug = "{{ :slug }}" video.setAttribute('poster',m[1]) s.parentNode.replaceChild(video,s); - console.log(m); - console.log(m[1]); - } - else{ - } }); diff --git a/themes/modern2/partials/index/top_section.htm b/themes/modern2/partials/index/top_section.htm index afb62a837..57f21f424 100644 --- a/themes/modern2/partials/index/top_section.htm +++ b/themes/modern2/partials/index/top_section.htm @@ -15,7 +15,7 @@
- {{firstPost.title}} + {{firstPost.title}}
{% partial 'index/post_item' post = firstPost category = category %}