From: Marc L. <ma...@ma...> - 2011-02-02 18:30:10
|
Ok, I see. I follow your hope that Tiki7's tiki.tpl will indeed will be simple enough, and if not, we can refork from stable tiki.tpl Thanks! On Wed, Feb 2, 2011 at 10:20 AM, Jonny Bradley <jo...@ti...> wrote: > > This may have been a misunderstanding on my part following discussions on IRC earlier with Gary. I thought skeleton was "tiki without it's skin on" - i.e. what's there without any design on top. > > Turns out it was a different simplified version of tiki - either way, the tiki.tpl was in need of significant fixing following all the new module stuff, so probably easiest to start again. > > But hopefully, Tiki 7 will just be so much simpler this won't be necessary. > > Can restore it if you want. > > jb > > > On 2 Feb 2011, at 14:25, Marc Laporte wrote: > >> So skeleton.css no longer needs own tiki.tpl? >> >> >>> On 2011-02-02 6:09 AM, <jon...@us...> wrote: >>> >>> Revision: 32361 >>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32361&view=rev >>> Author: jonnybradley >>> Date: 2011-02-02 11:09:44 +0000 (Wed, 02 Feb 2011) >>> >>> Log Message: >>> ----------- >>> [REM] modules revamp: Remove prefs (and tiki-bot_bar.tpl) replaced by modules in the three installer scripts. >>> feature_sitelogo, feature_site_login, feature_top_bar, feature_topbar_id_menu, feature_sitemenu, feature_sitesearch, >>> feature_site_report, feature_site_send_link, feature_tell_a_friend, feature_bot_bar_power_by_tw, feature_topbar_version, feature_bot_bar_icons, feature_bot_bar_rss, feature_babelfish, feature_babelfish_logo, feature_bot_bar_debug, feature_bot_bar >>> feature_sitemycode, sitemycode, sitemycode_publish, feature_secondary_sitemenu_custom_code, feature_sitemenu_custom_code, feature_custom_center_column_header, bot_logo_code, feature_bot_logo, feature_topbar_custom_code >>> >>> Modified Paths: >>> -------------- >>> trunk/installer/schema/20101230_create_top_modules_tiki.php >>> trunk/installer/schema/20110115_create_bottom_modules_tiki.php >>> trunk/installer/schema/20110201_c_code_to_user_modules_tiki.php >>> trunk/lib/prefs/feature.php >>> trunk/lib/prefs/global.php >>> trunk/lib/setup/prefs.php >>> trunk/templates/error_ticket.tpl >>> trunk/templates/styles/twist/tiki.tpl >>> trunk/templates/tiki-admin_include_connect.tpl >>> trunk/templates/tiki-admin_include_features.tpl >>> trunk/templates/tiki-admin_include_look.tpl >>> trunk/templates/tiki-admin_include_performance.tpl >>> trunk/templates/tiki-admin_include_search.tpl >>> trunk/templates/tiki.tpl >>> trunk/tiki-setup.php >>> >>> Removed Paths: >>> ------------- >>> trunk/lib/prefs/bot.php >>> trunk/lib/prefs/sitemycode.php >>> trunk/templates/styles/skeleton/tiki.tpl >>> trunk/templates/tiki-bot_bar.tpl >>> >>> Modified: trunk/installer/schema/20101230_create_top_modules_tiki.php >>> =================================================================== >>> --- trunk/installer/schema/20101230_create_top_modules_tiki.php 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/installer/schema/20101230_create_top_modules_tiki.php 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -15,6 +15,7 @@ >>> * feature_sitelogo >>> * feature_site_login >>> * feature_top_bar >>> + * feature_topbar_id_menu >>> * feature_sitemenu >>> * feature_sitesearch >>> */ >>> >>> Modified: trunk/installer/schema/20110115_create_bottom_modules_tiki.php >>> =================================================================== >>> --- trunk/installer/schema/20110115_create_bottom_modules_tiki.php 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/installer/schema/20110115_create_bottom_modules_tiki.php 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -22,6 +22,7 @@ >>> * feature_babelfish >>> * feature_babelfish_logo (TODO - still needs lib/setup/babelfish.php for this to work and i can't work out why) >>> * feature_bot_bar_debug >>> + * feature_bot_bar >>> */ >>> >>> function upgrade_20110115_create_bottom_modules_tiki( $installer ) { >>> >>> Modified: trunk/installer/schema/20110201_c_code_to_user_modules_tiki.php >>> =================================================================== >>> --- trunk/installer/schema/20110201_c_code_to_user_modules_tiki.php 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/installer/schema/20110201_c_code_to_user_modules_tiki.php 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -20,6 +20,7 @@ >>> * feature_custom_center_column_header >>> * bot_logo_code >>> * feature_bot_logo >>> + * feature_topbar_custom_code >>> */ >>> >>> function upgrade_20110201_c_code_to_user_modules_tiki( $installer ) { >>> @@ -103,7 +104,7 @@ >>> // $installer->query( "DELETE FROM `tiki_preferences` WHERE `name` IN ". >>> // "('feature_sitemycode','sitemycode', 'sitemycode_publish', 'feature_secondary_sitemenu_custom_code', >>> // 'feature_sitemenu_custom_code', 'feature_custom_center_column_header', >>> -// 'bot_logo_code', 'feature_bot_logo');"); >>> +// 'bot_logo_code', 'feature_bot_logo', 'feature_topbar_custom_code');"); >>> >>> } >>> >>> >>> Deleted: trunk/lib/prefs/bot.php >>> =================================================================== >>> --- trunk/lib/prefs/bot.php 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/lib/prefs/bot.php 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -1,17 +0,0 @@ >>> -<?php >>> -// (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project >>> -// >>> -// All Rights Reserved. See copyright.txt for details and a complete list of authors. >>> -// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. >>> -// $Id$ >>> - >>> -function prefs_bot_list() { >>> - return array( >>> - 'bot_logo_code' => array( >>> - 'name' => tra('Custom Site Footer Content'), >>> - 'hint' => tra('Example:') . ' ' . '<div style="text-align: center"><small>Powered by Tiki Wiki CMS Groupware</small></div>', >>> - 'type' => 'textarea', >>> - 'size' => '6', >>> - ), >>> - ); >>> -} >>> >>> Modified: trunk/lib/prefs/feature.php >>> =================================================================== >>> --- trunk/lib/prefs/feature.php 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/lib/prefs/feature.php 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -1077,13 +1077,6 @@ >>> ), >>> 'perspective' => false, >>> ), >>> - 'feature_bot_bar_power_by_tw' => array( >>> - 'name' => tra("Add a Powered by Tiki link on your site's footer"), >>> - 'type' => 'flag', >>> - 'dependencies' => array( >>> - 'feature_bot_bar', >>> - ), >>> - ), >>> 'feature_editcss' => array( >>> 'name' => tra('Edit CSS'), >>> 'type' => 'flag', >>> @@ -1120,81 +1113,16 @@ >>> 'type' => 'flag', >>> 'description' => tra('The <base> tag specifies a default address for all links on a page.'), >>> ), >>> - 'feature_sitemycode' => array( >>> - 'name' => tra('Custom Site Header'), >>> - 'type' => 'flag', >>> - 'warning' => tra('Obsolete in tiki7'), >>> - ), >>> 'feature_sitelogo' => array( >>> 'name' => tra('Site Logo and Title'), >>> 'type' => 'flag', >>> 'warning' => tra('Obsolete in tiki7'), >>> ), >>> - 'feature_sitesearch' => array( >>> - 'name' => tra('Search Bar'), >>> - 'type' => 'flag', >>> - 'dependencies' => array( >>> - 'feature_search_fulltext', >>> - ), >>> - 'warning' => tra('Obsolete in tiki7'), >>> - ), >>> - 'feature_site_login' => array( >>> - 'name' => tra('Login Bar'), >>> - 'type' => 'flag', >>> - 'warning' => tra('Obsolete in tiki7'), >>> - ), >>> - 'feature_topbar_custom_code' => array( >>> - 'name' => tra('Top Bar Custom Code'), >>> - 'type' => 'textarea', >>> - 'size' => '6', >>> - 'filter' => 'rawhtml_unsafe', >>> - ), >>> - 'feature_topbar_version' => array( >>> - 'name' => tra('Display current Tiki version'), >>> - 'type' => 'flag', >>> - 'dependencies' => array( >>> - 'feature_bot_bar_power_by_tw', >>> - ), >>> - ), >>> - 'feature_sitemenu' => array( >>> - 'name' => tra('Site menu bar'), >>> - 'type' => 'flag', >>> - 'warning' => tra('Obsolete in tiki7'), >>> - ), >>> - 'feature_sitemenu_custom_code' => array ( >>> - 'name' => tra('Site menu custom code'), >>> - 'type' => 'textarea', >>> - 'size' => '4', >>> - 'hint' => tra('Example:') . " {if isset(\$objectCategoryIds) and in_array(2, \$objectCategoryIds)} >>> - {menu id=43 css=y type=horiz}{else}{menu id=44 css=y type=horiz}{/if}", >>> - ), >>> - 'feature_secondary_sitemenu_custom_code' => array ( >>> - 'name' => tra('Secondary site menu custom code'), >>> - 'type' => 'textarea', >>> - 'size' => '2', >>> - 'hint' => tra('Example:') . " {if \$prefs.language eq \"fr\"} <a href=\"tiki-switch_lang.php?language=en\">-English-</a> {else} <a href=\"tiki-switch_lang.php?language=fr\">-Français-</a>{/if}", >>> - ), >>> - 'feature_topbar_id_menu' => array( >>> - 'name' => tra('Menu ID'), >>> - 'hint' => tra('Needs CSS Menus'), >>> - 'type' => 'text', >>> - 'size' => '5', >>> - 'dependencies' => array( >>> - 'feature_cssmenus', >>> - ), >>> - 'warning' => tra('Obsolete in tiki7'), >>> - ), >>> 'feature_top_bar' => array( >>> 'name' => tra('Top Bar'), >>> 'type' => 'flag', >>> 'warning' => tra('Obsolete in tiki7'), >>> ), >>> - 'feature_custom_center_column_header' => array( >>> - 'name' => tra('Custom Center Column Header'), >>> - 'hint' => tra('Example:') . " {if \$page eq 'Travel'}{banner zone=5}{/if}", >>> - 'type' => 'textarea', >>> - 'size' => '6', >>> - ), >>> 'feature_left_column' => array( >>> 'name' => tra('Left column'), >>> 'type' => 'list', >>> @@ -1255,10 +1183,6 @@ >>> 'feature_wiki_description', >>> ), >>> ), >>> - 'feature_bot_logo' => array( >>> - 'name' => tra('Custom Site Footer'), >>> - 'type' => 'flag', >>> - ), >>> 'feature_endbody_code' => array( >>> 'name' => tra('Custom End of <body> Code'), >>> 'hint' => tra('Example:') . ' ' . "{wiki}{literal}{GOOGLEANALYTICS(account=xxxx) /}{/literal}{/wiki}", >>> @@ -1269,20 +1193,8 @@ >>> 'feature_bot_bar' => array( >>> 'name' => tra('Bottom bar'), >>> 'type' => 'flag', >>> + 'warning' => tra('Obsolete in tiki7'), >>> ), >>> - 'feature_bot_bar_icons' => array( >>> - 'name' => tra('Bottom bar icons'), >>> - 'type' => 'flag', >>> - ), >>> - 'feature_bot_bar_debug' => array( >>> - 'name' => tra('Bottom bar debug'), >>> - 'type' => 'flag', >>> - 'description' => tra('Indicate various debug-related information in the footer of the site (Execution time, Memory usage, etc.)'), >>> - ), >>> - 'feature_bot_bar_rss' => array( >>> - 'name' => tra('Bottom bar (RSS)'), >>> - 'type' => 'flag', >>> - ), >>> 'feature_site_report' => array( >>> 'name' => tra('Webmaster Report'), >>> 'type' => 'flag', >>> >>> Modified: trunk/lib/prefs/global.php >>> =================================================================== >>> --- trunk/lib/prefs/global.php 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/lib/prefs/global.php 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -173,12 +173,6 @@ >>> 'name' => tra('Each group can have its theme'), >>> 'type' => 'flag', >>> ), >>> - 'sitemycode' => array( >>> - 'name' => tra('Custom Site Header Content'), >>> - 'hint' => tra ('Example:') . ' ' . "{if \$user neq ''}<div align=\"right\" style=\"float: right; font-size: 10px\">{tr}logged as:{/tr} {\$user}</div>{/if}", >>> - 'type' => 'textarea', >>> - 'size' => '6', >>> - ), >>> 'sitetitle' => array( >>> 'name' => tra('Site title'), >>> 'type' => 'text', >>> >>> Deleted: trunk/lib/prefs/sitemycode.php >>> =================================================================== >>> --- trunk/lib/prefs/sitemycode.php 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/lib/prefs/sitemycode.php 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -1,15 +0,0 @@ >>> -<?php >>> -// (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project >>> -// >>> -// All Rights Reserved. See copyright.txt for details and a complete list of authors. >>> -// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. >>> -// $Id$ >>> - >>> -function prefs_sitemycode_list() { >>> - return array( >>> - 'sitemycode_publish' => array( >>> - 'name' => tra('Publish'), >>> - 'type' => 'flag', >>> - ), >>> - ); >>> -} >>> >>> Modified: trunk/lib/setup/prefs.php >>> =================================================================== >>> --- trunk/lib/setup/prefs.php 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/lib/setup/prefs.php 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -1329,21 +1329,6 @@ >>> >>> 'site_crumb_seper' => '»', >>> 'site_nav_seper' => '|', >>> - 'feature_sitemycode' => 'y', >>> - 'sitemycode' => '{if $tiki_p_admin == "y"} >>> -<div id="quickadmin" style="text-align: left; padding-left: 12px;"><small>{tr}Quick Admin{/tr}</small>: >>> -{icon _id=database_refresh title="{tr}Clear all Tiki caches{/tr}" href="tiki-admin_system.php?do=all"} >>> -{icon _id=wrench title="{tr}Modify the look & feel (logo, theme, etc.){/tr}" href="tiki-admin.php?page=look&cookietab=2"} >>> -{if $prefs.lang_use_db eq "y"} >>> -{if isset($smarty.session.interactive_translation) && $smarty.session.interactive_translation_mode eq "on"} >>> -{icon _id=world_edit title="{tr}Toggle interactive translation off{/tr}" href="tiki-interactive_trans.php?interactive_translation_mode=off"} >>> -{else} >>> -{icon _id=world_edit title="{tr}Toggle interactive translation on{/tr}" href="tiki-interactive_trans.php?interactive_translation_mode=on"} >>> -{/if} >>> -{/if} >>> -</div> >>> -{/if}', >>> - 'sitemycode_publish' => 'n', >>> 'feature_sitelogo' => 'y', >>> 'sitelogo_bgcolor' => 'transparent', >>> 'sitelogo_bgstyle' => '', >>> @@ -1359,19 +1344,10 @@ >>> 'sitead_publish' => 'n', >>> 'feature_breadcrumbs' => 'n', >>> 'feature_siteloclabel' => 'y', >>> - 'feature_sitesearch' => 'y', >>> - 'feature_site_login' => 'y', >>> - 'feature_sitemenu' => 'n', >>> - 'feature_sitemenu_custom_code' => '', >>> - 'feature_secondary_sitemenu_custom_code' => '', >>> - 'feature_topbar_version' => 'n', >>> - 'feature_topbar_id_menu' => '42', >>> - 'feature_topbar_custom_code' => '', >>> 'feature_sitetitle' => 'y', >>> 'feature_sitedesc' => 'n', >>> - 'feature_bot_logo' => 'n', >>> 'feature_endbody_code' => '', >>> - 'feature_custom_html_head_content' => '{if $prefs.feature_secondary_sitemenu_custom_code ne ""}<style type="text/css">#sitelogo img {literal}{margin-top: 0; position: relative; top: -12px;}{/literal}</style>{/if}', >>> + 'feature_custom_html_head_content' => '', >>> 'feature_fixed_width' => 'y', >>> 'feature_html_head_base_tag' => 'n', >>> 'feature_themegenerator' => 'n', >>> @@ -1387,10 +1363,6 @@ >>> 'feature_right_column' => 'y', >>> 'feature_top_bar' => 'y', >>> 'feature_bot_bar' => 'y', >>> - 'feature_bot_bar_icons' => 'n', >>> - 'feature_bot_bar_debug' => 'n', >>> - 'feature_bot_bar_rss' => 'y', >>> - 'feature_bot_bar_power_by_tw' => 'y', >>> 'maxRecords' => 25, >>> 'maxArticles' => 10, >>> 'maxVersions' => 0, >>> @@ -1417,7 +1389,6 @@ >>> 'footer_shadow_end' => '', >>> 'box_shadow_start' => '', >>> 'box_shadow_end' => '', >>> - 'feature_custom_center_column_header' => '', >>> 'header_custom_css' => '', >>> 'header_custom_js' => '', >>> 'feature_theme_generator' => 'n', >>> @@ -1677,7 +1648,6 @@ >>> 'load_threshold' => 3, >>> 'site_busy_msg' => 'Server is currently too busy; please come back later.', >>> >>> - 'bot_logo_code' => '', >>> 'feature_create_webhelp' => 'n', >>> 'page_n_times_in_a_structure' => 'n', >>> 'feature_forums_search' => 'n', >>> >>> Modified: trunk/templates/error_ticket.tpl >>> =================================================================== >>> --- trunk/templates/error_ticket.tpl 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/templates/error_ticket.tpl 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -56,7 +56,7 @@ >>> </div> >>> {if $prefs.feature_bot_bar eq 'y'} >>> <div id="tiki-bot"> >>> - {include file='tiki-bot_bar.tpl'} >>> + {* modules revamp: TODO include file='tiki-bot_bar.tpl' *} >>> </div> >>> {/if} >>> </div> >>> >>> Deleted: trunk/templates/styles/skeleton/tiki.tpl >>> =================================================================== >>> --- trunk/templates/styles/skeleton/tiki.tpl 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/templates/styles/skeleton/tiki.tpl 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -1,92 +0,0 @@ >>> -{* $Id$ *}<!DOCTYPE html >>> - PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" >>> - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> >>> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}" lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="page_{$page_id}"{/if}> >>> - <head> >>> - {include file='header.tpl'} >>> - </head> >>> - <body{html_body_attributes}> >>> - <ul class="jumplinks" style="position:absolute;top:-9000px;left:-9000px;z-index:9;"> >>> - <li><a href="#tiki-center">{tr}Jump to Content{/tr}</a></li> >>> - </ul> >>> - {if $prefs.feature_ajax eq 'y'} >>> - {include file='tiki-ajax_header.tpl'} >>> - {/if} >>> - <div id="fixedwidth"> {* enables fixed-width layouts *} >>> - <div id="main"> >>> - <div class="clearfix" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> >>> - {* Site header section *} >>> - <div class="clearfix" id="siteheader"> >>> - {include file='tiki-site_header.tpl'} >>> - </div> >>> - </div> >>> - <div class="clearfix" id="middle"> >>> - <div class="clearfix {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'}nofullscreen{else}fullscreen{/if}" id="c1c2"> >>> - <div class="clearfix" id="wrapper"> >>> - <div id="col1" class="{if $prefs.feature_left_column eq 'fixed' or ($prefs.feature_left_column ne 'n' && $left_modules|@count > 0 && $show_columns.left_modules ne 'n')}marginleft{/if}{if $prefs.feature_left_column eq 'fixed' or ($prefs.feature_right_column ne 'n' && $right_modules|@count > 0 && $show_columns.right_modules ne 'n')} marginright{/if}"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> >>> - <div id="tiki-center" {*id needed for ajax editpage link*} class="clearfix content"> >>> - {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} >>> - <div id="custom_center_column_header"> >>> - {eval var=$prefs.feature_custom_center_column_header} >>> - </div> >>> - {/if} >>> - {if $display_msg} >>> - {remarksbox type="note" title="{tr}Notice{/tr}"} >>> - {$display_msg|escape} >>> - {/remarksbox} >>> - {/if} >>> - <div id="role_main"> >>> - {$mid_data} {* You can modify mid_data using tiki-show_page.tpl *} >>> - </div> >>> - {show_help} >>> - </div> >>> - </div> >>> - </div> >>> - <hr class="hidden" />{* for semantic separation of center and side columns *} >>> - {if $prefs.feature_left_column eq 'fixed' or ($prefs.feature_left_column ne 'n' && $left_modules|@count > 0 && $show_columns.left_modules ne 'n')} >>> - <div id="col2"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> >>> - <h2 class="hidden">Sidebar</h2> >>> - <div class="content"> >>> - {section name=homeix loop=$left_modules} >>> - {$left_modules[homeix].data} >>> - {/section} >>> - </div> >>> - </div> >>> - {/if} >>> - </div>{* -- END of c1c2 -- *} >>> - {if $prefs.feature_left_column eq 'fixed' or ($prefs.feature_right_column ne 'n' && $right_modules|@count > 0 && $show_columns.right_modules ne 'n')} >>> - <div class="clearfix" id="col3"{if $prefs.feature_right_column eq 'user'} style="display:{if isset($cookie.show_rightcolumn) and $cookie.show_rightcolumn ne 'y'} none{elseif isset($ie6)} block{else} table-cell{/if};"{/if}{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> >>> - <h2 class="hidden">Sidebar</h2> >>> - <div class="content"> >>> - {section name=homeix loop=$right_modules} >>> - {$right_modules[homeix].data} >>> - {/section} >>> - </div> >>> - </div> >>> - <br style="clear:both" /> >>> - {/if} >>> - <!--[if IE 7]><br style="clear:both; height: 0" /><![endif]--> >>> - </div>{* -- END of middle -- *} >>> - {if $prefs.feature_bot_bar eq 'y'} >>> - <div id="footer"> >>> - <div class="footerbgtrap"> >>> - <div class="content"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> >>> - {include file='tiki-bot_bar.tpl'} >>> - </div> >>> - </div> >>> - </div>{* -- END of footer -- *} >>> - {/if} >>> - </div>{* -- END of main -- *} >>> - </div> {* -- END of fixedwidth -- *} >>> - {include file='footer.tpl'} >>> - {if $prefs.feature_endbody_code}{*this code must be added just before </body>: needed by google analytics *} >>> - {eval var=$prefs.feature_endbody_code} >>> - {/if} >>> - {interactivetranslation} >>> - <!-- Put JS at the end --> >>> - {if $headerlib} >>> - {$headerlib->output_js_files()} >>> - {$headerlib->output_js()} >>> - {/if} >>> - </body> >>> -</html> >>> >>> Modified: trunk/templates/styles/twist/tiki.tpl >>> =================================================================== >>> --- trunk/templates/styles/twist/tiki.tpl 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/templates/styles/twist/tiki.tpl 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -78,9 +78,6 @@ >>> {/if} >>> >>> {if $prefs.feature_layoutshadows eq 'y'}<div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if}<div id="tiki-center" {*id needed for ajax editpage link*} class="clearfix content"> >>> - {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} >>> - {eval var=$prefs.feature_custom_center_column_header} >>> - {/if} >>> {$mid_data} >>> {show_help} >>> </div>{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if} >>> >>> Modified: trunk/templates/tiki-admin_include_connect.tpl >>> =================================================================== >>> --- trunk/templates/tiki-admin_include_connect.tpl 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/templates/tiki-admin_include_connect.tpl 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -10,7 +10,7 @@ >>> <form class="admin" id="connect" name="connect" action="tiki-admin.php?page=connect" method="post"> >>> <fieldset> >>> <legend>{tr}Help Tiki spread{/tr}</legend> >>> - {preference name=feature_bot_bar_power_by_tw} >>> + {tr}Add the "Powered By" module to your site: {/tr} <a href="tiki-admin_modules.php">{tr}Click here to manage modules{/tr}</a> >>> </fieldset> >>> >>> <fieldset> >>> >>> Modified: trunk/templates/tiki-admin_include_features.tpl >>> =================================================================== >>> --- trunk/templates/tiki-admin_include_features.tpl 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/templates/tiki-admin_include_features.tpl 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -130,7 +130,6 @@ >>> <div class="adminoptionboxchild" id="log_sql_childcontainer"> >>> {preference name=log_sql_perf_min} >>> </div> >>> - {preference name=feature_bot_bar_debug} >>> {preference name=log_tpl} >>> </fieldset> >>> </div> >>> >>> Modified: trunk/templates/tiki-admin_include_look.tpl >>> =================================================================== >>> --- trunk/templates/tiki-admin_include_look.tpl 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/templates/tiki-admin_include_look.tpl 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -86,14 +86,6 @@ >>> {tab name="{tr}General Layout options{/tr}"} >>> {preference name=feature_html_head_base_tag} >>> {preference name=feature_custom_html_head_content} >>> - {preference name=feature_secondary_sitemenu_custom_code} >>> - {preference name=feature_sitemycode} >>> - <div class="adminoptionboxchild" id="feature_sitemycode_childcontainer"> >>> - {icon _id=information} >>> - <em>{tr}The Custom Site Header will display for the Admin only. Select <strong>Publish</strong> to display the content for <em>all</em> users.{/tr}</em> >>> - {preference name=sitemycode} >>> - {preference name=sitemycode_publish} >>> - </div> >>> >>> {preference name=feature_sitelogo} >>> <div class="adminoptionboxchild" id="feature_sitelogo_childcontainer"> >>> @@ -113,19 +105,8 @@ >>> {preference name=sitesubtitle} >>> </fieldset> >>> </div> >>> - {preference name=feature_site_login} >>> {preference name=feature_top_bar} >>> - <div class="adminoptionboxchild" id="feature_top_bar_childcontainer"> >>> - {preference name=feature_sitemenu} >>> - <div class="adminoptionboxchild" id="feature_sitemenu_childcontainer"> >>> - {preference name=feature_sitemenu_custom_code} >>> - {preference name=feature_topbar_id_menu} >>> - </div> >>> - {preference name=feature_sitesearch} >>> - {preference name=feature_topbar_custom_code} >>> - </div> >>> >>> - {preference name=feature_custom_center_column_header} >>> {preference name=feature_left_column} >>> {preference name=feature_right_column} >>> >>> @@ -143,22 +124,10 @@ >>> {preference name=feature_sitedesc} >>> </div> >>> >>> - {preference name=feature_bot_logo} >>> - <div class="adminoptionboxchild" id="feature_bot_logo_childcontainer"> >>> - {preference name=bot_logo_code} >>> - </div> >>> - >>> {preference name=feature_endbody_code} >>> >>> {preference name=feature_bot_bar} >>> <div class="adminoptionboxchild" id="feature_bot_bar_childcontainer"> >>> - {preference name=feature_bot_bar_icons} >>> - {preference name=feature_bot_bar_debug} >>> - {preference name=feature_bot_bar_rss} >>> - {preference name=feature_bot_bar_power_by_tw} >>> - <div class="adminoptionboxchild" id="feature_bot_bar_power_by_tw_childcontainer"> >>> - {preference name=feature_topbar_version} >>> - </div> >>> </div> >>> >>> <div class="adminoptionbox"> >>> >>> Modified: trunk/templates/tiki-admin_include_performance.tpl >>> =================================================================== >>> --- trunk/templates/tiki-admin_include_performance.tpl 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/templates/tiki-admin_include_performance.tpl 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -31,7 +31,6 @@ >>> </div> >>> {preference name=tiki_cachecontrol_session} >>> {preference name=smarty_compilation} >>> - {preference name=feature_bot_bar_debug} >>> {/tab} >>> >>> {tab name="{tr}Bytecode Cache{/tr}"} >>> >>> Modified: trunk/templates/tiki-admin_include_search.tpl >>> =================================================================== >>> --- trunk/templates/tiki-admin_include_search.tpl 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/templates/tiki-admin_include_search.tpl 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -76,7 +76,6 @@ >>> >>> <fieldset> >>> <legend>{tr}Features{/tr}</legend> >>> - {preference name=feature_sitesearch} >>> {preference name=feature_referer_highlight} >>> {preference name=search_parsed_snippet} >>> {preference name=feature_search_stats} >>> >>> Deleted: trunk/templates/tiki-bot_bar.tpl >>> =================================================================== >>> --- trunk/templates/tiki-bot_bar.tpl 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/templates/tiki-bot_bar.tpl 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -1,91 +0,0 @@ >>> -<div class="container"> >>> -{if $prefs.feature_bot_logo eq 'y'}<div id="custom_site_footer">{eval var=$prefs.bot_logo_code}</div>{/if} >>> -{if ($prefs.feature_site_report eq 'y' && $tiki_p_site_report eq 'y') || ($prefs.feature_site_send_link eq 'y' and $prefs.feature_tell_a_friend eq 'y' and $tiki_p_tell_a_friend eq 'y')} >>> - <div id="site_report"> >>> - {if $prefs.feature_site_report eq 'y'} >>> - <a href="tiki-tell_a_friend.php?report=y&url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Report to Webmaster{/tr}</a> >>> - {/if} >>> - {if $prefs.feature_share eq 'y' } >>> - <a href="tiki-share.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Share this page{/tr}</a> >>> - {/if} >>> - {if $prefs.feature_site_send_link eq 'y'} >>> - <a href="tiki-tell_a_friend.php?url={$smarty.server.REQUEST_URI|escape:'url'}">{tr}Email this page{/tr}</a> >>> - {/if} >>> - </div> >>> -{/if} >>> -{if $prefs.feature_bot_bar_icons eq 'y'} >>> - <div id="power_icons"> >>> - <a href="http://tiki.org/" title="Tiki"><img alt="{tr}Powered by{/tr} Tiki" src="img/tiki/tikibutton2.png" /></a> >>> - <a href="http://php.net/" title="PHP"><img alt="{tr}Powered by{/tr} PHP" src="img/php.png" /></a> >>> - <a href="http://smarty.net/" title="Smarty"><img alt="{tr}Powered by{/tr} Smarty" src="img/smarty.gif" /></a> >>> - <a href="http://www.w3.org/Style/CSS/" title="CSS"><img alt="{tr}Made with{/tr} CSS" src="img/css1.png" /></a> >>> - </div> >>> -{/if} >>> -{if $prefs.feature_bot_bar_rss eq 'y'} >>> - <div id="rss" style="text-align: center"> >>> - {if $prefs.feature_wiki eq 'y' and $prefs.feed_wiki eq 'y' and $tiki_p_view eq 'y'} >>> - <a title="{tr}Wiki RSS{/tr}" href="tiki-wiki_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a> >>> - <small>{tr}Wiki{/tr}</small> >>> - {/if} >>> - {if $prefs.feature_blogs eq 'y' and $prefs.feed_blogs eq 'y' and ($tiki_p_read_blog eq 'y' or $tiki_p_blog_view_ref eq 'y')} >>> - <a title="{tr}Blogs RSS{/tr}" href="tiki-blogs_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a> >>> - <small>{tr}Blogs{/tr}</small> >>> - {/if} >>> - {if $prefs.feature_articles eq 'y' and $prefs.feed_articles eq 'y' and ($tiki_p_read_article eq 'y' or $tiki_p_articles_read_heading eq 'y')} >>> - <a title="{tr}Articles RSS{/tr}" href="tiki-articles_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a> >>> - <small>{tr}Articles{/tr}</small> >>> - {/if} >>> - {if $prefs.feature_galleries eq 'y' and $prefs.feed_image_galleries eq 'y' and $tiki_p_view_image_gallery eq 'y'} >>> - <a title="{tr}Image Galleries RSS{/tr}" href="tiki-image_galleries_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a> >>> - <small>{tr}Image Galleries{/tr}</small> >>> - {/if} >>> - {if $prefs.feature_file_galleries eq 'y' and $prefs.feed_file_galleries eq 'y' and $tiki_p_view_file_gallery eq 'y'} >>> - <a title="{tr}File Galleries RSS{/tr}" href="tiki-file_galleries_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a> >>> - <small>{tr}File Galleries{/tr}</small> >>> - {/if} >>> - {if $prefs.feature_forums eq 'y' and $prefs.feed_forums eq 'y' and $tiki_p_forum_read eq 'y'} >>> - <a title="{tr}Forums RSS{/tr}" href="tiki-forums_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a> >>> - <small>{tr}Forums{/tr}</small> >>> - {/if} >>> - {if $prefs.feature_maps eq 'y' and $prefs.rss_mapfiles eq 'y' and $tiki_p_map_view eq 'y'} >>> - <a title="{tr}Maps RSS{/tr}" href="tiki-map_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a> >>> - <small>{tr}Maps{/tr}</small> >>> - {/if} >>> - {if $prefs.feature_directory eq 'y' and $prefs.feed_directories eq 'y' and $tiki_p_view_directory eq 'y'} >>> - <a href="tiki-directories_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a> >>> - <small>{tr}Directories{/tr}</small> >>> - {/if} >>> - {if $prefs.feature_calendar eq 'y' and $prefs.feed_calendar eq 'y' and $tiki_p_view_calendar eq 'y'} >>> - <a href="tiki-calendars_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a> >>> - <small>{tr}Calendars{/tr}</small> >>> - {/if} >>> - {if $prefs.feature_shoutbox eq 'y' and $prefs.feed_shoutbox eq 'y' and $tiki_p_view_shoutbox eq 'y'} >>> - <a href="tiki-shoutbox_rss.php?ver={$prefs.feed_default_version}">{icon style='vertical-align: text-bottom;' _id='feed' alt="{tr}RSS feed{/tr}"}</a> >>> - <small>{tr}Shoutbox{/tr}</small> >>> - {/if} >>> - </div> >>> -{/if} >>> -{if $prefs.feature_babelfish eq 'y' or $prefs.feature_babelfish_logo eq 'y'} >>> - {include file='babelfish.tpl'} >>> -{/if} >>> -<div id="power"> >>> - {if $prefs.feature_bot_bar_power_by_tw ne 'n'} >>> - {tr}Powered by{/tr} <a href="http://tiki.org" title="© 2002–{$smarty.now|date_format:"%Y"} {tr}The Tiki Community{/tr}">{tr}Tiki Wiki CMS Groupware{/tr}</a> {if $prefs.feature_topbar_version eq 'y'} v{$tiki_version} {if $tiki_uses_svn eq 'y'} (SVN){/if} -{$tiki_star}- {/if} | >>> - {/if} >>> - <div id="credits"> >>> - {include file='credits.tpl'} >>> - </div> >>> -</div> >>> -</div> >>> -{if $prefs.feature_bot_bar_debug eq 'y'} >>> -<div id="loadstats" style="text-align: center"> >>> - <small>[ {tr}Execution time:{/tr} {elapsed} {tr}secs{/tr} ] [ {tr}Memory usage:{/tr} {memusage} ] [ {$num_queries} {tr}database queries used in {/tr} {$elapsed_in_db|truncate:3:''} {tr}secs{/tr} ]{if $server_load and $server_load ne '?'} [ {tr}Server load:{/tr} {$server_load} ]{/if}</small> >>> -</div> >>> -{/if} >>> - >>> -{if !empty($lastup)} >>> -<div class="cvsup" style="font-size:x-small;text-align:center;color:#999;">{tr}Last update from SVN{/tr} ({$tiki_version}): {$lastup|tiki_long_datetime} >>> -{/if} >>> -{if !empty($svnrev)} >>> - - REV {$svnrev} >>> -{/if} >>> >>> Modified: trunk/templates/tiki.tpl >>> =================================================================== >>> --- trunk/templates/tiki.tpl 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/templates/tiki.tpl 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -99,9 +99,6 @@ >>> {/if} >>> >>> {if $prefs.feature_layoutshadows eq 'y'}<div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if}<div id="tiki-center" {*id needed for ajax editpage link*} class="clearfix content"> >>> - {if $prefs.feature_custom_center_column_header}{* Content comes from Look and Feel admin *} >>> - <div id="custom_center_column_header">{eval var=$prefs.feature_custom_center_column_header}</div> >>> - {/if} >>> {if $display_msg} >>> {remarksbox type="note" title="{tr}Notice{/tr}"}{$display_msg|escape}{/remarksbox} >>> {/if} >>> @@ -172,9 +169,6 @@ >>> {section name=homeix loop=$bottom_modules} >>> {$bottom_modules[homeix].data} >>> {/section} >>> - {* modules revamp temp fix for feature_bot_logo - TODO migrate to user modules *} >>> - {if $prefs.feature_bot_logo eq 'y'}<div id="custom_site_footer">{eval var=$prefs.bot_logo_code}</div>{/if} >>> - {* include file='tiki-bot_bar.tpl' *} >>> </div> >>> </div> >>> </div> >>> >>> Modified: trunk/tiki-setup.php >>> =================================================================== >>> --- trunk/tiki-setup.php 2011-02-02 10:38:22 UTC (rev 32360) >>> +++ trunk/tiki-setup.php 2011-02-02 11:09:44 UTC (rev 32361) >>> @@ -40,7 +40,7 @@ >>> $crumbs[] = new Breadcrumb($prefs['browsertitle'], '', $prefs['tikiIndex']); >>> if ($prefs['site_closed'] == 'y') require_once ('lib/setup/site_closed.php'); >>> require_once ('lib/setup/error_reporting.php'); >>> -if ($prefs['feature_bot_bar_debug'] == 'y' || $prefs['use_load_threshold'] == 'y') require_once ('lib/setup/load_threshold.php'); >>> +if ($prefs['use_load_threshold'] == 'y') require_once ('lib/setup/load_threshold.php'); >>> if (($prefs['feature_wysiwyg'] != 'n' && $prefs['feature_wysiwyg'] != 'y') || $prefs['case_patched'] == 'n') require_once ('lib/setup/patches.php'); >>> require_once ('lib/setup/sections.php'); >>> require_once ('lib/headerlib.php'); >>> >>> >>> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >>> >>> ------------------------------------------------------------------------------ >>> Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! >>> Finally, a world-class log management solution at an even better price-free! >>> Download using promo code Free_Logger_4_Dev2Dev. Offer expires >>> February 28th, so secure your free ArcSight Logger TODAY! >>> http://p.sf.net/sfu/arcsight-sfd2d >>> _______________________________________________ >>> Tikiwiki-cvs mailing list >>> Tik...@li... >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> >> ------------------------------------------------------------------------------ >> Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! >> Finally, a world-class log management solution at an even better price-free! >> Download using promo code Free_Logger_4_Dev2Dev. Offer expires >> February 28th, so secure your free ArcSight Logger TODAY! >> http://p.sf.net/sfu/arcsight-sfd2d_______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > -- Marc Laporte http://MarcLaporte.com http://Tiki.org/MarcLaporte http://AvanTech.net |