From 772ed656b95fc96d469d276f74017bdf25a6a4d9 Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 13 Jan 2021 20:05:07 +0100 Subject: [PATCH 01/19] add page_classes freely definable classes for navigation (each page can have its own classes) --- acp/core/pages.edit.php | 5 +++++ acp/core/pages.edit_form.php | 7 +++++-- acp/versions.php | 6 +++--- core/functions/func_get_content.php | 2 +- core/functions/func_navigation.php | 3 +++ install/contents/fc_pages.php | 1 + install/contents/fc_pages_cache.php | 1 + lib/lang/de/dict-backend.php | 1 + lib/lang/en/dict-backend.php | 1 + styles/default/templates/navigation.tpl | 2 +- 10 files changed, 22 insertions(+), 7 deletions(-) diff --git a/acp/core/pages.edit.php b/acp/core/pages.edit.php index cda28223..e1cbae67 100755 --- a/acp/core/pages.edit.php +++ b/acp/core/pages.edit.php @@ -267,6 +267,7 @@ "page_linkname" => "$page_linkname", "page_permalink" => "$page_permalink", "page_permalink_short" => "$page_permalink_short", + "page_classes" => "$page_classes", "page_hash" => "$page_hash", "page_type_of_use" => "$page_type_of_use", "page_redirect" => "$page_redirect", @@ -337,6 +338,7 @@ "page_linkname" => "$page_linkname", "page_permalink" => "$page_permalink", "page_permalink_short" => "$page_permalink_short", + "page_classes" => "$page_classes", "page_hash" => "$page_hash", "page_type_of_use" => "$page_type_of_use", "page_redirect" => "$page_redirect", @@ -395,6 +397,7 @@ "page_linkname" => "$page_linkname", "page_permalink" => "$page_permalink", "page_permalink_short" => "$page_permalink_short", + "page_classes" => "$page_classes", "page_hash" => "$page_hash", "page_type_of_use" => "$page_type_of_use", "page_redirect" => "$page_redirect", @@ -466,6 +469,7 @@ "page_linkname" => "$page_linkname", "page_permalink" => "$page_language", "page_permalink_short" => "$page_permalink_short", + "page_classes" => "$page_classes", "page_hash" => "$page_hash", "page_type_of_use" => "$page_type_of_use", "page_redirect" => "$page_redirect", @@ -530,6 +534,7 @@ "page_linkname" => "$page_linkname", "page_permalink" => "$page_language", "page_permalink_short" => "$page_permalink_short", + "page_classes" => "$page_classes", "page_hash" => "$page_hash", "page_type_of_use" => "$page_type_of_use", "page_redirect" => "$page_redirect", diff --git a/acp/core/pages.edit_form.php b/acp/core/pages.edit_form.php index d3ccade7..280542df 100644 --- a/acp/core/pages.edit_form.php +++ b/acp/core/pages.edit_form.php @@ -202,10 +202,13 @@ echo'
'; echo '
'; -echo '
'; +echo '
'; echo tpl_form_control_group('',$lang['f_page_linkname'],''); echo '
'; -echo '
'; +echo '
'; +echo tpl_form_control_group('',$lang['f_page_classes'],""); +echo '
'; +echo '
'; echo tpl_form_control_group('',$lang['f_page_hash'],""); echo '
'; echo '
'; diff --git a/acp/versions.php b/acp/versions.php index 18854738..c2d086ac 100755 --- a/acp/versions.php +++ b/acp/versions.php @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/core/functions/func_get_content.php b/core/functions/func_get_content.php index baf5b61e..c42b0fce 100644 --- a/core/functions/func_get_content.php +++ b/core/functions/func_get_content.php @@ -75,7 +75,7 @@ function get_content($page, $mode = 'p') { $nav_sql_filter = "WHERE page_status != 'draft' AND page_status != 'ghost' AND page_language = '$languagePack'"; } - $nav_sql = "SELECT page_id, page_hash, page_language, page_linkname, page_permalink, page_title, page_sort, page_status + $nav_sql = "SELECT page_id, page_classes, page_hash, page_language, page_linkname, page_permalink, page_title, page_sort, page_status FROM fc_pages $nav_sql_filter ORDER BY page_sort DESC"; $fc_nav = $db_content->query("$nav_sql")->fetchAll(); diff --git a/core/functions/func_navigation.php b/core/functions/func_navigation.php index 61fda7f0..0bb4d46f 100644 --- a/core/functions/func_navigation.php +++ b/core/functions/func_navigation.php @@ -38,6 +38,7 @@ function show_mainmenu() { $menu[$i]['page_title'] = stripslashes($fc_nav[$i]['page_title']); $menu[$i]['page_permalink'] = $fc_nav[$i]['page_permalink']; $menu[$i]['page_hash'] = $fc_nav[$i]['page_hash']; + $menu[$i]['page_classes'] = $fc_nav[$i]['page_classes']; $menu[$i]['link_status'] = $fc_defs['main_nav_class']; if(left_string($current_page_sort) == left_string($menu[$i]['page_sort']) ) { @@ -149,6 +150,7 @@ function build_submenu($index,$level=1) { $submenu[$index]['page_sort'] = $fc_nav[$index]['page_sort']; $submenu[$index]['page_permalink'] = $fc_nav[$index]['page_permalink']; $submenu[$index]['page_hash'] = $fc_nav[$index]['page_hash']; + $submenu[$index]['page_classes'] = $fc_nav[$index]['page_classes']; $submenu[$index]['page_linkname'] = stripslashes($fc_nav[$index]['page_linkname']); $submenu[$index]['page_title'] = stripslashes($fc_nav[$index]['page_title']); @@ -194,6 +196,7 @@ function show_sitemap() { $page_title = $fc_nav[$i]['page_title']; $page_status = $fc_nav[$i]['page_status']; $page_hash = $fc_nav[$i]['page_hash']; + $page_classes = $fc_nav[$i]['page_classes']; $page_permalink = $fc_nav[$i]['page_permalink']; $li_class = ''; diff --git a/install/contents/fc_pages.php b/install/contents/fc_pages.php index 8a4662cd..ab40a367 100644 --- a/install/contents/fc_pages.php +++ b/install/contents/fc_pages.php @@ -16,6 +16,7 @@ "page_redirect" => "VARCHAR(100) NOT NULL DEFAULT ''", "page_redirect_code" => "VARCHAR(20) NOT NULL DEFAULT ''", "page_funnel_uri" => "VARCHAR(500) NOT NULL DEFAULT ''", + "page_classes" => "VARCHAR(100) NOT NULL DEFAULT ''", "page_hash" => "VARCHAR(50) NOT NULL DEFAULT ''", "page_psw" => "VARCHAR(255) NOT NULL DEFAULT ''", "page_title" => "VARCHAR(255) NOT NULL DEFAULT ''", diff --git a/install/contents/fc_pages_cache.php b/install/contents/fc_pages_cache.php index 8018d83b..e34642d1 100644 --- a/install/contents/fc_pages_cache.php +++ b/install/contents/fc_pages_cache.php @@ -25,6 +25,7 @@ "page_redirect" => "VARCHAR(100) NOT NULL DEFAULT ''", "page_redirect_code" => "VARCHAR(20) NOT NULL DEFAULT ''", "page_funnel_uri" => "VARCHAR(500) NOT NULL DEFAULT ''", + "page_classes" => "VARCHAR(100) NOT NULL DEFAULT ''", "page_hash" => "VARCHAR(50) NOT NULL DEFAULT ''", "page_psw" => "VARCHAR(255) NOT NULL DEFAULT ''", "page_title" => "VARCHAR(255) NOT NULL DEFAULT ''", diff --git a/lib/lang/de/dict-backend.php b/lib/lang/de/dict-backend.php index 7244148e..3589ffff 100644 --- a/lib/lang/de/dict-backend.php +++ b/lib/lang/de/dict-backend.php @@ -215,6 +215,7 @@ $lang['f_page_permalink'] = "Permalink"; $lang['f_page_permalink_short'] = "Permalink"; $lang['f_page_permalink_short'] = "Kurz-Link"; +$lang['f_page_classes'] = "Klassen"; $lang['f_page_hash'] = "Hash"; $lang['f_page_redirect'] = "Weiterleitung"; $lang['btn_redirect'] = "Weiterleitungen"; diff --git a/lib/lang/en/dict-backend.php b/lib/lang/en/dict-backend.php index 2a45efeb..d157f168 100644 --- a/lib/lang/en/dict-backend.php +++ b/lib/lang/en/dict-backend.php @@ -218,6 +218,7 @@ $lang['f_page_linkname'] = "Linkname"; $lang['f_page_permalink'] = "Permalink"; $lang['f_page_permalink_short'] = "Short-Link"; +$lang['f_page_classes'] = "Classes"; $lang['f_page_hash'] = "Hash"; $lang['f_page_redirect'] = "Redirect"; $lang['btn_redirect'] = "Redirects"; diff --git a/styles/default/templates/navigation.tpl b/styles/default/templates/navigation.tpl index 7d213d14..7758251c 100644 --- a/styles/default/templates/navigation.tpl +++ b/styles/default/templates/navigation.tpl @@ -9,7 +9,7 @@
  • {$homepage_linkname}
    • {foreach item=nav from=$arr_menue} -
  • +
  • {$nav.page_linkname}
    • {/foreach} From 184d042df21371a8fbccdfbdc09b22de39221111 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 19 Jan 2021 17:34:50 +0100 Subject: [PATCH 02/19] list existing pages in tinyMCE --- acp/core/linklist.php | 62 +++++++++++++++++++++++++++++ styles/default/js/tinyMCE_config.js | 2 + 2 files changed, 64 insertions(+) create mode 100644 acp/core/linklist.php diff --git a/acp/core/linklist.php b/acp/core/linklist.php new file mode 100644 index 00000000..8f6f8cf1 --- /dev/null +++ b/acp/core/linklist.php @@ -0,0 +1,62 @@ + 'mysql', + 'database_name' => "$database_name", + 'server' => "$database_host", + 'username' => "$database_user", + 'password' => "$database_psw", + + 'charset' => 'utf8', + 'port' => $database_port, + + 'prefix' => DB_PREFIX + ]); + + $db_content = $database; + +} else { + $db_type = 'sqlite'; + $db_content = new Medoo([ + 'database_type' => 'sqlite', + 'database_file' => CONTENT_DB + ]); +} + +$page_data = $db_content->select("fc_pages", [ + "page_permalink", + "page_title" +]); + +foreach($page_data as $page) { + $pages[$counter]['title'] = $page['page_title']. '-> (/'.$page['page_permalink'].')'; + $pages[$counter]['value'] = '/'.$page['page_permalink']; + $counter++; +} + +header('Content-type: text/javascript'); +header('pragma: no-cache'); +header('expires: 0'); +echo json_encode($pages); + +?> \ No newline at end of file diff --git a/styles/default/js/tinyMCE_config.js b/styles/default/js/tinyMCE_config.js index a7088b02..6c7f0a83 100644 --- a/styles/default/js/tinyMCE_config.js +++ b/styles/default/js/tinyMCE_config.js @@ -21,6 +21,8 @@ $(function() { image_list : "core/imagelist.php", image_advtab: true, image_title: true, + + link_list : "core/linklist.php", convert_urls: false, templates: [ From 4a29aa7bea73cde79f02882b080dd9e79a38aa31 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 19 Jan 2021 17:39:23 +0100 Subject: [PATCH 03/19] fix - display error if more than six addons are installed --- acp/core/dashboard.addons.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/acp/core/dashboard.addons.php b/acp/core/dashboard.addons.php index 66e58395..3c570318 100644 --- a/acp/core/dashboard.addons.php +++ b/acp/core/dashboard.addons.php @@ -24,10 +24,6 @@ $poster_img = ''; } - if($i % 6 == 0) { - echo '
    '; - } - if(is_file("$mod_info_file")) { unset($mod,$modnav); From 0050ba6da15154465285fa3ba28ff22077ec89cc Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 23 Jan 2021 17:19:01 +0100 Subject: [PATCH 04/19] fix - wrong price calculation (gross/net) --- core/posts-display.php | 10 +++++++++- core/posts-list.php | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/core/posts-display.php b/core/posts-display.php index 9eb0acc0..a59606c9 100644 --- a/core/posts-display.php +++ b/core/posts-display.php @@ -139,7 +139,15 @@ $this_entry = str_replace("{post_file_attachment}", $filepath, $this_entry); /* products */ -$post_price_gross = $post_data['post_product_price_net']*($post_data['post_product_tax']+100)/100;; +if($post_data['post_product_tax'] == '1') { + $tax = $fc_prefs['prefs_posts_products_default_tax']; +} else if($post_data['post_product_tax'] == '2') { + $tax = $fc_prefs['prefs_posts_products_tax_alt1']; +} else { + $tax = $fc_prefs['prefs_posts_products_tax_alt2']; +} + +$post_price_gross = $post_data['post_product_price_net']*($tax+100)/100; $post_price_gross = fc_post_print_currency($post_price_gross); $this_entry = str_replace("{post_price_gross}", $post_price_gross, $this_entry); $this_entry = str_replace("{post_currency}", $post_data['post_product_currency'], $this_entry); diff --git a/core/posts-list.php b/core/posts-list.php index 3ed17a99..e33b9acd 100644 --- a/core/posts-list.php +++ b/core/posts-list.php @@ -269,7 +269,14 @@ $this_entry = str_replace("{post_tpl_event_prices}", $price_list, $this_entry); /* products */ - $post_price_gross = $get_posts[$k]['post_product_price_net']*($get_posts[$k]['post_product_tax']+100)/100;; + if($get_posts[$k]['post_product_tax'] == '1') { + $tax = $fc_prefs['prefs_posts_products_default_tax']; + } else if($get_posts[$k]['post_product_tax'] == '2') { + $tax = $fc_prefs['prefs_posts_products_tax_alt1']; + } else { + $tax = $fc_prefs['prefs_posts_products_tax_alt2']; + } + $post_price_gross = $get_posts[$k]['post_product_price_net']*($tax+100)/100;; $post_price_gross = fc_post_print_currency($post_price_gross); $this_entry = str_replace("{post_price_gross}", $post_price_gross, $this_entry); From 010f23e2e38476a8b80c62eb430d9d439760b637 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 23 Jan 2021 20:21:31 +0100 Subject: [PATCH 05/19] new - we can now use text_parser() function in the Main-Navigation --- core/switch.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/switch.php b/core/switch.php index 39b233c7..e38dc147 100644 --- a/core/switch.php +++ b/core/switch.php @@ -38,7 +38,12 @@ $bcmenu = breadcrumbs_menu($current_page_sort); $fc_sitemap = show_sitemap(); -$smarty->assign('homepage_linkname', $mainmenu['homepage_linkname']); +$cnt_menu = count($mainmenu); +for($i=0;$i<$cnt_menu;$i++) { + $mainmenu[$i]['page_linkname'] = text_parser($mainmenu[$i]['page_linkname']); +} + +$smarty->assign('homepage_linkname', text_parser($mainmenu['homepage_linkname'])); $smarty->assign('homepage_title', $mainmenu['homepage_title']); unset($mainmenu['homepage_linkname'],$mainmenu['homepage_title']); From 6a760ad558a39735fb1846a5efb36a624affb7fa Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 23 Jan 2021 20:59:41 +0100 Subject: [PATCH 06/19] fix - text_parser in main navigation creates empty entries --- core/switch.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/switch.php b/core/switch.php index e38dc147..4e207a75 100644 --- a/core/switch.php +++ b/core/switch.php @@ -40,9 +40,15 @@ $cnt_menu = count($mainmenu); for($i=0;$i<$cnt_menu;$i++) { - $mainmenu[$i]['page_linkname'] = text_parser($mainmenu[$i]['page_linkname']); + if($mainmenu[$i]['page_linkname'] != '') { + $mainmenu[$i]['page_linkname'] = text_parser($mainmenu[$i]['page_linkname']); + } } +echo '
    ';
+print_r($mainmenu);
+echo '
    '; + $smarty->assign('homepage_linkname', text_parser($mainmenu['homepage_linkname'])); $smarty->assign('homepage_title', $mainmenu['homepage_title']); unset($mainmenu['homepage_linkname'],$mainmenu['homepage_title']); From 442a29b3eaa5d991c4b322719916839497fe3d92 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 23 Jan 2021 21:03:36 +0100 Subject: [PATCH 07/19] Update switch.php --- core/switch.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/switch.php b/core/switch.php index 4e207a75..3be0c549 100644 --- a/core/switch.php +++ b/core/switch.php @@ -45,10 +45,6 @@ } } -echo '
    ';
-print_r($mainmenu);
-echo '
    '; - $smarty->assign('homepage_linkname', text_parser($mainmenu['homepage_linkname'])); $smarty->assign('homepage_title', $mainmenu['homepage_title']); unset($mainmenu['homepage_linkname'],$mainmenu['homepage_title']); From f5eb0af9cd64a2fb55e2d34033e3d7d1dbb01666 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 24 Jan 2021 11:55:33 +0100 Subject: [PATCH 08/19] fix - prices in posts (products) --- core/posts-display.php | 7 ++++++- core/posts-list.php | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/core/posts-display.php b/core/posts-display.php index a59606c9..a48d0c33 100644 --- a/core/posts-display.php +++ b/core/posts-display.php @@ -147,9 +147,14 @@ $tax = $fc_prefs['prefs_posts_products_tax_alt2']; } -$post_price_gross = $post_data['post_product_price_net']*($tax+100)/100; +$post_product_price_net = str_replace(',', '.', $post_data['post_product_price_net']); + +$post_price_gross = $post_product_price_net*($tax+100)/100; $post_price_gross = fc_post_print_currency($post_price_gross); +$post_price_net = fc_post_print_currency($post_product_price_net); $this_entry = str_replace("{post_price_gross}", $post_price_gross, $this_entry); +$this_entry = str_replace("{post_price_net}", $post_price_net, $this_entry); +$this_entry = str_replace("{post_price_tax}", $tax, $this_entry); $this_entry = str_replace("{post_currency}", $post_data['post_product_currency'], $this_entry); $this_entry = str_replace("{post_product_unit}", $post_data['post_product_unit'], $this_entry); $this_entry = str_replace("{post_product_amount}", $post_data['post_product_amount'], $this_entry); diff --git a/core/posts-list.php b/core/posts-list.php index e33b9acd..94ba5d9c 100644 --- a/core/posts-list.php +++ b/core/posts-list.php @@ -276,10 +276,16 @@ } else { $tax = $fc_prefs['prefs_posts_products_tax_alt2']; } - $post_price_gross = $get_posts[$k]['post_product_price_net']*($tax+100)/100;; + + $post_price_net = str_replace(',', '.', $get_posts[$k]['post_product_price_net']); + + $post_price_gross = $post_price_net*($tax+100)/100;; $post_price_gross = fc_post_print_currency($post_price_gross); + $post_price_net = fc_post_print_currency($post_price_net); $this_entry = str_replace("{post_price_gross}", $post_price_gross, $this_entry); + $this_entry = str_replace("{post_price_net}", $post_price_net, $this_entry); + $this_entry = str_replace("{post_price_tax}", $tax, $this_entry); $this_entry = str_replace("{post_currency}", $get_posts[$k]['post_product_currency'], $this_entry); $this_entry = str_replace("{post_product_unit}", $get_posts[$k]['post_product_unit'], $this_entry); $this_entry = str_replace("{post_product_price_label}", $get_posts[$k]['post_product_price_label'], $this_entry); From 8736d38d4adc8e56948852b69d592bca1a5a35fe Mon Sep 17 00:00:00 2001 From: Patrick Date: Sun, 24 Jan 2021 13:46:06 +0100 Subject: [PATCH 09/19] fix - price formatting in posts --- acp/core/posts.edit.php | 15 +++++++++++++-- acp/core/posts.list.php | 14 +++++++++++++- core/posts-display.php | 3 ++- core/posts-list.php | 3 ++- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/acp/core/posts.edit.php b/acp/core/posts.edit.php index a0466192..8a246dab 100644 --- a/acp/core/posts.edit.php +++ b/acp/core/posts.edit.php @@ -364,6 +364,17 @@ $select_tax .= ''; $select_tax .= ''; +$post_product_price_net = $post_data['post_product_price_net']; +if($post_product_price_net == '') { + $post_product_price_net = '0,00'; +} + +$post_product_currency = $post_data['post_product_currency']; +if($post_product_currency == '') { + $post_product_currency = $fc_preferences['prefs_posts_products_default_currency']; +} + + /* add text snippet to prices */ $snippet_select_pricelist = ' + + \ No newline at end of file From d2350aa8eea141dc9b49438386e19393cba1c5d7 Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 4 Feb 2021 20:02:16 +0100 Subject: [PATCH 18/19] improved blog templates - Different buttons depending on post type - Count Images in Galleries - Fix missing Teaser in Messages without images --- core/posts-list.php | 55 +++++++++++-------- lib/lang/de/dict-frontend.php | 2 + lib/lang/en/dict-frontend.php | 5 +- .../default/templates/posts/post-list-l.tpl | 5 +- .../templates/posts/post-list-m-wo.tpl | 2 +- 5 files changed, 41 insertions(+), 28 deletions(-) diff --git a/core/posts-list.php b/core/posts-list.php index e52eea90..cac3bf91 100644 --- a/core/posts-list.php +++ b/core/posts-list.php @@ -242,9 +242,6 @@ } - $this_entry = str_replace("{read_more_text}", $lang['btn_read_more'], $this_entry); - $this_entry = str_replace('{post_href}', $post_href, $this_entry); - $this_entry = str_replace('{post_author}', $get_posts[$k]['post_autor'], $this_entry); $this_entry = str_replace('{post_title}', $get_posts[$k]['post_title'], $this_entry); $this_entry = str_replace('{post_teaser}', $post_teaser, $this_entry); @@ -275,33 +272,47 @@ $this_entry = str_replace("{post_tpl_event_prices}", $price_list, $this_entry); /* products */ - if($get_posts[$k]['post_product_tax'] == '1') { - $tax = $fc_prefs['prefs_posts_products_default_tax']; - } else if($get_posts[$k]['post_product_tax'] == '2') { - $tax = $fc_prefs['prefs_posts_products_tax_alt1']; - } else { - $tax = $fc_prefs['prefs_posts_products_tax_alt2']; + if($get_posts[$k]['post_type'] == 'p') { + + if($get_posts[$k]['post_product_tax'] == '1') { + $tax = $fc_prefs['prefs_posts_products_default_tax']; + } else if($get_posts[$k]['post_product_tax'] == '2') { + $tax = $fc_prefs['prefs_posts_products_tax_alt1']; + } else { + $tax = $fc_prefs['prefs_posts_products_tax_alt2']; + } + + $post_price_net = str_replace('.', '', $get_posts[$k]['post_product_price_net']); + $post_price_net = str_replace(',', '.', $post_price_net); + + $post_price_gross = $post_price_net*($tax+100)/100;; + $post_price_gross = fc_post_print_currency($post_price_gross); + $post_price_net = fc_post_print_currency($post_price_net); + + $this_entry = str_replace("{post_price_gross}", $post_price_gross, $this_entry); + $this_entry = str_replace("{post_price_net}", $post_price_net, $this_entry); + $this_entry = str_replace("{post_price_tax}", $tax, $this_entry); + $this_entry = str_replace("{post_currency}", $get_posts[$k]['post_product_currency'], $this_entry); + $this_entry = str_replace("{post_product_unit}", $get_posts[$k]['post_product_unit'], $this_entry); + $this_entry = str_replace("{post_product_price_label}", $get_posts[$k]['post_product_price_label'], $this_entry); + + $this_entry = str_replace("{read_more_text}", $lang['btn_open_product'], $this_entry); } - $post_price_net = str_replace('.', '', $get_posts[$k]['post_product_price_net']); - $post_price_net = str_replace(',', '.', $post_price_net); - - $post_price_gross = $post_price_net*($tax+100)/100;; - $post_price_gross = fc_post_print_currency($post_price_gross); - $post_price_net = fc_post_print_currency($post_price_net); - $this_entry = str_replace("{post_price_gross}", $post_price_gross, $this_entry); - $this_entry = str_replace("{post_price_net}", $post_price_net, $this_entry); - $this_entry = str_replace("{post_price_tax}", $tax, $this_entry); - $this_entry = str_replace("{post_currency}", $get_posts[$k]['post_product_currency'], $this_entry); - $this_entry = str_replace("{post_product_unit}", $get_posts[$k]['post_product_unit'], $this_entry); - $this_entry = str_replace("{post_product_price_label}", $get_posts[$k]['post_product_price_label'], $this_entry); /* links */ $this_entry = str_replace("{post_external_link}", $get_posts[$k]['post_link'], $this_entry); - $this_entry = str_replace("{post_thumbnails}", $thumbnails_str, $this_entry); + /* gallery */ + if($get_posts[$k]['post_type'] == 'g') { + $this_entry = str_replace("{post_thumbnails}", $thumbnails_str, $this_entry); + $this_entry = str_replace("{read_more_text}", $lang['btn_show_gallery'], $this_entry); + $this_entry = str_replace("{cnt_images}", $cnt_thumbs_array, $this_entry); + } + $this_entry = str_replace("{read_more_text}", $lang['btn_read_more'], $this_entry); + $this_entry = str_replace('{post_href}', $post_href, $this_entry); $posts_list .= $this_entry; diff --git a/lib/lang/de/dict-frontend.php b/lib/lang/de/dict-frontend.php index ead5f9e9..766f350d 100644 --- a/lib/lang/de/dict-frontend.php +++ b/lib/lang/de/dict-frontend.php @@ -72,6 +72,8 @@ $lang['link_register'] = "Jetzt registrieren ..."; $lang['btn_read_more'] = "weiter lesen"; $lang['btn_download'] = "Download"; +$lang['btn_show_gallery'] = "Alle {cnt_images} Bilder anzeigen"; +$lang['btn_open_product'] = "Weitere Informationen"; /* Messages */ $lang['msg_missingfield'] = "Alle Felder müssen ausgefüllt werden"; diff --git a/lib/lang/en/dict-frontend.php b/lib/lang/en/dict-frontend.php index 8d92feed..10c9b7de 100644 --- a/lib/lang/en/dict-frontend.php +++ b/lib/lang/en/dict-frontend.php @@ -69,9 +69,10 @@ $lang['button_acp_edit_page'] = "Edit Page"; $lang['link_delete_avatar'] = "Delete Avatar"; $lang['link_register'] = "Register now ..."; -$lang['btn_read_more'] = "read more"; +$lang['btn_read_more'] = "Read more"; $lang['btn_download'] = "Download"; - +$lang['btn_show_gallery'] = "Show {cnt_images} Images"; +$lang['btn_open_product'] = "More Informations"; /* Messages */ $lang['msg_missingfield'] = "All fields are required"; diff --git a/styles/default/templates/posts/post-list-l.tpl b/styles/default/templates/posts/post-list-l.tpl index 53ceb5c3..51bc0d95 100644 --- a/styles/default/templates/posts/post-list-l.tpl +++ b/styles/default/templates/posts/post-list-l.tpl @@ -7,15 +7,14 @@
{post_author} {post_releasedate} -

{post_title}

 +

{post_title}

 {post_teaser} -

{post_external_link}

+

{post_external_link}

{post_cats}

-

{read_more_text}

\ No newline at end of file diff --git a/styles/default/templates/posts/post-list-m-wo.tpl b/styles/default/templates/posts/post-list-m-wo.tpl index e9091cc1..6593b9e0 100644 --- a/styles/default/templates/posts/post-list-m-wo.tpl +++ b/styles/default/templates/posts/post-list-m-wo.tpl @@ -2,7 +2,7 @@ {post_author} {post_releasedate}

{post_title}

 - + {post_teaser}

{post_cats}

From a5955e730c8f2574698cc5ff032a6775566f962c Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 5 Feb 2021 11:29:39 +0100 Subject: [PATCH 19/19] increase version info (build 143) --- acp/versions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acp/versions.php b/acp/versions.php index c4438257..010d9b57 100755 --- a/acp/versions.php +++ b/acp/versions.php @@ -1,5 +1,5 @@ \ No newline at end of file