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); diff --git a/acp/core/functions.php b/acp/core/functions.php index 0ede1700..3ae8730c 100644 --- a/acp/core/functions.php +++ b/acp/core/functions.php @@ -617,7 +617,12 @@ function generate_xml_sitemap() { $results = $db_content->select("fc_pages", "*", [ - "ORDER" => ["page_lastedit" => "DESC"] + "AND" => [ + "page_status[!]" => ["draft","private","ghost"] + ], + "ORDER" => [ + "page_lastedit" => "DESC" + ] ]); $cnt_results = count($results); 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/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/core/posts.edit.php b/acp/core/posts.edit.php index a0466192..df05fc83 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 diff --git a/acp/versions.php b/acp/versions.php index 18854738..010d9b57 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..5c3aa3e7 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(); @@ -156,7 +156,10 @@ function fc_get_type_of_use_pages($type) { global $languagePack; $page = $db_content->get("fc_pages", ["page_permalink", "page_funnel_uri"], [ - "page_type_of_use" => "$type" + "AND" => [ + "page_type_of_use" => "$type", + "page_language" => "$languagePack" + ] ]); return $page; 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/core/posts-display.php b/core/posts-display.php index 9eb0acc0..ce1629d6 100644 --- a/core/posts-display.php +++ b/core/posts-display.php @@ -16,6 +16,24 @@ $post_lastedit = date('Y-m-d H:i',$post_data['lastedit']); $post_lastedit_from = $post_data['post_lastedit_from']; +/* categories */ +$tpl_category_link = fc_load_posts_tpl($fc_template,'link-categories.tpl'); +$cat_links_array = explode('<->',$post_data['post_categories']); + +foreach($all_categories as $cats) { + + $link = $tpl_category_link; + + if(in_array($cats['cat_id'],$cat_links_array)) { + $post_cats_string .= $cats['cat_name'] .' '; + $cat_href = '/'.$fct_slug.$cats['cat_name_clean']; + $link = str_replace('{cat_href}', $cat_href, $link); + $link = str_replace('{cat_name}', $cats['cat_name'], $link); + $post_cats_btn .= $link; + + } +} + /* event dates */ @@ -104,6 +122,11 @@ $this_entry = str_replace("{post_type}", $post_data['post_type'], $this_entry); $this_entry = str_replace('{post_img_src}', $first_post_image, $this_entry); +$this_entry = str_replace("{post_source}", $post_data['post_source'], $this_entry); +$this_entry = str_replace("{post_product_manufacturer}", $post_data['post_product_manufacturer'], $this_entry); +$this_entry = str_replace("{post_product_supplier}", $post_data['post_product_supplier'], $this_entry); +$this_entry = str_replace("{post_product_number}", $post_data['post_product_number'], $this_entry); + $this_entry = str_replace("{post_releasedate_ts}", $post_data['post_releasedate'], $this_entry); /* timestring */ $this_entry = str_replace("{post_releasedate}", $post_releasedate, $this_entry); $this_entry = str_replace("{post_releasedate_year}", $post_releasedate_year, $this_entry); @@ -127,7 +150,8 @@ $this_entry = str_replace("{video_id}", $video['v'], $this_entry); $this_entry = str_replace("{post_external_link}", $post_data['post_link'], $this_entry); -$this_entry = str_replace("{post_cats}", $cat_links_string, $this_entry); +$this_entry = str_replace("{post_cats}", $post_cats_btn, $this_entry); +$this_entry = str_replace("{post_cats_string}", $post_cats_string, $this_entry); $this_entry = str_replace("{back_to_overview}", $lang['back_to_overview'], $this_entry); $this_entry = str_replace("{back_link}", "/$fct_slug", $this_entry); @@ -139,9 +163,23 @@ $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_product_price_net = str_replace('.', '', $post_data['post_product_price_net']); +$post_product_price_net = str_replace(',', '.', $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 3ed17a99..cac3bf91 100644 --- a/core/posts-list.php +++ b/core/posts-list.php @@ -31,10 +31,11 @@ $tpl_list_p = fc_load_posts_tpl($fc_template,'post-list-p.tpl'); $tpl_list_f = fc_load_posts_tpl($fc_template,'post-list-f.tpl'); - $tpl_pagination = fc_load_posts_tpl($fc_template,'pagination.tpl'); $tpl_pagagination_list = fc_load_posts_tpl($fc_template,'pagination_list.tpl'); +$tpl_category_link = fc_load_posts_tpl($fc_template,'link-categories.tpl'); + $sql_start = ($posts_start*$posts_limit)-$posts_limit; if($sql_start < 0) { @@ -229,16 +230,18 @@ $cat_str = ''; foreach($all_categories as $cats) { + $link = $tpl_category_link; + if(in_array($cats['cat_id'], $post_categories)) { - $cat_str .= ''.$cats['cat_name'].' '; + $cat_href = '/'.$fct_slug.$cats['cat_name_clean']; + $link = str_replace('{cat_href}', $cat_href, $link); + $link = str_replace('{cat_name}', $cats['cat_name'], $link); + $cat_str .= $link; } } - $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); @@ -269,19 +272,47 @@ $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;; - $post_price_gross = fc_post_print_currency($post_price_gross); + 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); + } + - $this_entry = str_replace("{post_price_gross}", $post_price_gross, $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; @@ -297,7 +328,7 @@ $page_content = str_replace("{post_end_nbr}", $show_end, $page_content); if($display_mode == 'list_posts_category') { - $category_message = str_replace('{categorie}', $show_category_title, $lang['posts_category_filter']); + $category_message = str_replace('{categorie}', $selected_category_title, $lang['posts_category_filter']); $page_content = str_replace("{category_filter}", $category_message, $page_content); } else { $page_content = str_replace("{category_filter}", '', $page_content); diff --git a/core/posts.php b/core/posts.php index cd2d0cc7..6fdee072 100644 --- a/core/posts.php +++ b/core/posts.php @@ -27,16 +27,28 @@ $display_mode = 'show_post'; } +$tpl_nav_cats = fc_load_posts_tpl($fc_template,'nav-categories.tpl'); +$tpl_nav_cats_item = fc_load_posts_tpl($fc_template,'nav-categories-item.tpl'); + $all_categories = fc_get_categories(); $array_mod_slug = explode("/", $mod_slug); +$nav_categories_list = ''; -foreach($all_categories as $cats) { +foreach($all_categories as $cats) { + + $this_nav_cat_item = $tpl_nav_cats_item; + $show_category_title = $cats['cat_name']; + $this_nav_cat_item = str_replace('{nav_item_title}', $show_category_title, $this_nav_cat_item); + $cat_link = '/'.$fct_slug.$cats['cat_name_clean'].'/'; + $this_nav_cat_item = str_replace('{nav_item_link}', $cat_link, $this_nav_cat_item); + if($cats['cat_name_clean'] == $array_mod_slug[0]) { // show only posts from this category $posts_filter['categories'] = $cats['cat_id']; $display_mode = 'list_posts_category'; - $show_category_title = $cats['cat_name']; + $selected_category_title = $cats['cat_name']; + $this_nav_cat_item = str_replace('{nav_item_class}', 'active', $this_nav_cat_item); if($array_mod_slug[1] == 'p') { @@ -48,9 +60,16 @@ header("Connection: close"); } } + } else { + + $this_nav_cat_item = str_replace('{nav_item_class}', '', $this_nav_cat_item); + } + $nav_categories_list .= $this_nav_cat_item; } +$tpl_nav_cats = str_replace('{nav_categories_items}', $nav_categories_list, $tpl_nav_cats); + /* pagination f.e. /p/2/ or /p/3/ .... */ if($array_mod_slug[0] == 'p') { diff --git a/core/switch.php b/core/switch.php index 39b233c7..3be0c549 100644 --- a/core/switch.php +++ b/core/switch.php @@ -38,7 +38,14 @@ $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++) { + if($mainmenu[$i]['page_linkname'] != '') { + $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']); diff --git a/index.php b/index.php index 3f514110..e19df355 100644 --- a/index.php +++ b/index.php @@ -272,6 +272,7 @@ include 'core/posts.php'; } +$smarty->assign('nav_categories', $tpl_nav_cats); $tyo_search = fc_get_type_of_use_pages('search'); $smarty->assign("search_uri", '/'.$tyo_search['page_permalink']); 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/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-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/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/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: [ diff --git a/styles/default/templates/layout_default.tpl b/styles/default/templates/layout_default.tpl index 578fcc21..45ea694a 100644 --- a/styles/default/templates/layout_default.tpl +++ b/styles/default/templates/layout_default.tpl @@ -6,6 +6,7 @@ {include file='content.tpl'}
+ {$nav_categories} {include file='toc.tpl'} {include file='extracontent.tpl'} {include file='extracontent_global.tpl'} 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} diff --git a/styles/default/templates/posts/link-categories.tpl b/styles/default/templates/posts/link-categories.tpl new file mode 100644 index 00000000..75d9371f --- /dev/null +++ b/styles/default/templates/posts/link-categories.tpl @@ -0,0 +1 @@ +{cat_name} \ No newline at end of file diff --git a/styles/default/templates/posts/nav-categories-item.tpl b/styles/default/templates/posts/nav-categories-item.tpl new file mode 100644 index 00000000..8d5be990 --- /dev/null +++ b/styles/default/templates/posts/nav-categories-item.tpl @@ -0,0 +1 @@ +{nav_item_title} \ No newline at end of file diff --git a/styles/default/templates/posts/nav-categories.tpl b/styles/default/templates/posts/nav-categories.tpl new file mode 100644 index 00000000..d54a533a --- /dev/null +++ b/styles/default/templates/posts/nav-categories.tpl @@ -0,0 +1,4 @@ +
    + {nav_categories_items} +
    +
    \ No newline at end of file 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}