Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1457) +++ branches/2.8.x/CHANGELOG (revision 1458) @@ -11,6 +11,10 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------ +26 Jun-2011 Build 1458 Dietmar Woellbrink (Luisehahne) +# Ticket 833 fixed markup for table cells in view.php +! change themes.css to make style more flexible in success.htt and error.htt ++ backend themes: add js function redirect_to_page(url, timer) to redirect without message 25 Jun-2011 Build 1457 Dietmar Woellbrink (Luisehahne) ! Preparing 2.8.2 stable, last tests 10 Jun-2011 Build 1456 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1457) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1458) @@ -52,6 +52,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.2.RC6'); -if(!defined('REVISION')) define('REVISION', '1457'); +if(!defined('REVISION')) define('REVISION', '1458'); ?> Index: branches/2.8.x/wb/framework/class.wb.php =================================================================== --- branches/2.8.x/wb/framework/class.wb.php (revision 1457) +++ branches/2.8.x/wb/framework/class.wb.php (revision 1458) @@ -399,7 +399,6 @@ } $tpl->parse( 'main', 'main_block', false ); $tpl->pparse( 'output', 'page' ); - exit(); } // Print an error message Index: branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js =================================================================== --- branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js (revision 1457) +++ branches/2.8.x/wb/templates/wb_theme/jquery/jquery-plugins.js (revision 1458) @@ -1,26 +1,48 @@ -$(document).ready(function() -{ - - if($(".jcalendar").length) { - $.insert(WB_URL+"/include/jscalendar/calendar-system.css"); - } - - if($(".jsadmin").length) { - $.insert(WB_URL+"/modules/jsadmin/backend.css"); - } - - //Add external link class to external links - - $('a[href^="http://"]').filter(function() { - //Compare the anchor tag's host name with location's host name - return this.hostname && this.hostname !== location.hostname; - }).addClass("external").attr("target", "_blank"); - - /* Add internal link class to external links - */ - $('a[href^="http://"]').filter(function() { - //Compare the anchor tag's host name with location's host name - return this.hostname && this.hostname == location.hostname; - }).addClass("internal"); - - $('form').attr('autocomplete', 'off'); - +function include_file(filename, filetype) { + + if(!filetype) + var filetype = 'js'; //js default filetype + + var th = document.getElementsByTagName('head')[0]; + var s = document.createElement((filetype == "js") ? 'script' : 'link'); + + s.setAttribute('type',(filetype == "js") ? 'text/javascript' : 'text/css'); + + if (filetype == "css") + s.setAttribute('rel','stylesheet'); + + s.setAttribute((filetype == "js") ? 'src' : 'href', filename); + th.appendChild(s); + +} + +function redirect_to_page (url, timer) { + setTimeout('self.location.href="'+url+'"', timer); +} + +$(document).ready(function() +{ + + if($(".jcalendar").length) { + $.insert(WB_URL+"/include/jscalendar/calendar-system.css"); + } + + if($(".jsadmin").length) { + $.insert(WB_URL+"/modules/jsadmin/backend.css"); + } + + //Add external link class to external links - + $('a[href^="http://"]').filter(function() { + //Compare the anchor tag's host name with location's host name + return this.hostname && this.hostname !== location.hostname; + }).addClass("external").attr("target", "_blank"); + + /* Add internal link class to external links - */ + $('a[href^="http://"]').filter(function() { + //Compare the anchor tag's host name with location's host name + return this.hostname && this.hostname == location.hostname; + }).addClass("internal"); + + $('form').attr('autocomplete', 'off'); + }); \ No newline at end of file Index: branches/2.8.x/wb/templates/wb_theme/theme.css =================================================================== --- branches/2.8.x/wb/templates/wb_theme/theme.css (revision 1457) +++ branches/2.8.x/wb/templates/wb_theme/theme.css (revision 1458) @@ -152,7 +152,10 @@ .section-info { margin : 1.5em 0; } .rounded { border-radius :10px; -khtml-border-radius :10px; -webkit-border-radius :10px; -moz-border-radius :10px; } +.bigger { font-size :150%; } +.strong { font-weight :bold; } + .msg-box { background : #e5ffe6; border :0.2em #009900 solid; color :#336600; margin-bottom :1em; padding :0.63em; text-align :center; } .error-box { background :#fee; border :0.2em #844 solid; color :#400; margin-bottom :1em; padding :0.63em; text-align :center; } -.bigger { font-size :150%; } -.strong { font-weight :bold; } \ No newline at end of file +.msg-box p, +.error-box p { font-size :120%; } \ No newline at end of file Index: branches/2.8.x/wb/templates/argos_theme/jquery/jquery-plugins.js =================================================================== --- branches/2.8.x/wb/templates/argos_theme/jquery/jquery-plugins.js (revision 1457) +++ branches/2.8.x/wb/templates/argos_theme/jquery/jquery-plugins.js (revision 1458) @@ -1,25 +1,47 @@ -$(document).ready(function() -{ - - if($(".jcalendar").length) { - $.insert(WB_URL+"/include/jscalendar/calendar-system.css"); - } - - if($(".jsadmin").length) { - $.insert(WB_URL+"/modules/jsadmin/backend.css"); - } - //Add external link class to external links - - $('a[href^="http://"]').filter(function() { - //Compare the anchor tag's host name with location's host name - return this.hostname && this.hostname !== location.hostname; - }).addClass("external").attr("target", "_blank"); - - /* Add internal link class to external links - */ - $('a[href^="http://"]').filter(function() { - //Compare the anchor tag's host name with location's host name - return this.hostname && this.hostname == location.hostname; - }).addClass("internal"); - - $('form').attr('autocomplete', 'off'); - +function include_file(filename, filetype) { + + if(!filetype) + var filetype = 'js'; //js default filetype + + var th = document.getElementsByTagName('head')[0]; + var s = document.createElement((filetype == "js") ? 'script' : 'link'); + + s.setAttribute('type',(filetype == "js") ? 'text/javascript' : 'text/css'); + + if (filetype == "css") + s.setAttribute('rel','stylesheet'); + + s.setAttribute((filetype == "js") ? 'src' : 'href', filename); + th.appendChild(s); + +} + +function redirect_to_page (url, timer) { + setTimeout('self.location.href="'+url+'"', timer); +} + +$(document).ready(function() +{ + + if($(".jcalendar").length) { + $.insert(WB_URL+"/include/jscalendar/calendar-system.css"); + } + + if($(".jsadmin").length) { + $.insert(WB_URL+"/modules/jsadmin/backend.css"); + } + //Add external link class to external links - + $('a[href^="http://"]').filter(function() { + //Compare the anchor tag's host name with location's host name + return this.hostname && this.hostname !== location.hostname; + }).addClass("external").attr("target", "_blank"); + + /* Add internal link class to external links - */ + $('a[href^="http://"]').filter(function() { + //Compare the anchor tag's host name with location's host name + return this.hostname && this.hostname == location.hostname; + }).addClass("internal"); + + $('form').attr('autocomplete', 'off'); + }); \ No newline at end of file Index: branches/2.8.x/wb/templates/argos_theme/theme.css =================================================================== --- branches/2.8.x/wb/templates/argos_theme/theme.css (revision 1457) +++ branches/2.8.x/wb/templates/argos_theme/theme.css (revision 1458) @@ -181,7 +181,10 @@ .section-info { margin : 1.5em 0; } .rounded { border-radius :10px; -khtml-border-radius :10px; -webkit-border-radius :10px; -moz-border-radius :10px; } +.bigger { font-size :150%; } +.strong { font-weight :bold; } + .msg-box { background : #e5ffe6; border :0.2em #009900 solid; color :#336600; margin-bottom :1em; padding :0.63em; text-align :center; } .error-box { background :#fee; border :0.2em #844 solid; color :#400; margin-bottom :1em; padding :0.63em; text-align :center; } -.bigger { font-size :150%; } -.strong { font-weight :bold; } \ No newline at end of file +.msg-box p, +.error-box p { font-size :120%; } \ No newline at end of file Index: branches/2.8.x/wb/modules/news/view.php =================================================================== --- branches/2.8.x/wb/modules/news/view.php (revision 1457) +++ branches/2.8.x/wb/modules/news/view.php (revision 1458) @@ -375,7 +375,6 @@ } } else { $wb->print_error($MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'], 'view.php', false); - exit(0); } // Print post header @@ -420,12 +419,9 @@ } else { // Say no comments found $content = ''; - if(isset($TEXT['NONE_FOUND'])) { - $content .= ''.$TEXT['NONE_FOUND'].'
'; - } else { - $content .= 'None Found
'; - } - print $content; + $vars = array('[TITLE]','[COMMENT]','[TEXT_ON]','[DATE]','[TEXT_AT]','[TIME]','[TEXT_BY]','[USER_ID]','[USERNAME]','[DISPLAY_NAME]', '[EMAIL]'); + $values = array( '', $MOD_NEWS['NO_COMMENT_FOUND'], '', '', '', '', '', '', '', ''); + print str_replace($vars, $values, $setting_comments_loop); } // Print comments footer Index: branches/2.8.x/wb/modules/news/languages/NL.php =================================================================== --- branches/2.8.x/wb/modules/news/languages/NL.php (revision 1457) +++ branches/2.8.x/wb/modules/news/languages/NL.php (revision 1458) @@ -1,40 +1,41 @@ - \ No newline at end of file Index: branches/2.8.x/wb/modules/news/languages/PL.php =================================================================== --- branches/2.8.x/wb/modules/news/languages/PL.php (revision 1457) +++ branches/2.8.x/wb/modules/news/languages/PL.php (revision 1458) @@ -34,6 +34,7 @@ $MOD_NEWS['TEXT_ADD_COMMENT'] = 'Dodaj komentarz'; $MOD_NEWS['TEXT_BY'] = 'Dodano:'; $MOD_NEWS['PAGE_NOT_FOUND'] = 'Strona nie istnieje'; +$MOD_NEWS['NO_COMMENT_FOUND'] = 'No comment found'; $TEXT['UNKNOWN'] = 'Gość'; ?> \ No newline at end of file Index: branches/2.8.x/wb/modules/news/languages/NO.php =================================================================== --- branches/2.8.x/wb/modules/news/languages/NO.php (revision 1457) +++ branches/2.8.x/wb/modules/news/languages/NO.php (revision 1458) @@ -1,39 +1,40 @@ - \ No newline at end of file Index: branches/2.8.x/wb/modules/news/languages/EN.php =================================================================== --- branches/2.8.x/wb/modules/news/languages/EN.php (revision 1457) +++ branches/2.8.x/wb/modules/news/languages/EN.php (revision 1458) @@ -1,39 +1,40 @@ - \ No newline at end of file Index: branches/2.8.x/wb/modules/news/languages/DA.php =================================================================== --- branches/2.8.x/wb/modules/news/languages/DA.php (revision 1457) +++ branches/2.8.x/wb/modules/news/languages/DA.php (revision 1458) @@ -1,39 +1,40 @@ - + Index: branches/2.8.x/wb/modules/news/languages/RU.php =================================================================== --- branches/2.8.x/wb/modules/news/languages/RU.php (revision 1457) +++ branches/2.8.x/wb/modules/news/languages/RU.php (revision 1458) @@ -1,39 +1,40 @@ - \ No newline at end of file Index: branches/2.8.x/wb/modules/news/languages/FR.php =================================================================== --- branches/2.8.x/wb/modules/news/languages/FR.php (revision 1457) +++ branches/2.8.x/wb/modules/news/languages/FR.php (revision 1458) @@ -1,39 +1,40 @@ - \ No newline at end of file Index: branches/2.8.x/wb/modules/news/languages/SE.php =================================================================== --- branches/2.8.x/wb/modules/news/languages/SE.php (revision 1457) +++ branches/2.8.x/wb/modules/news/languages/SE.php (revision 1458) @@ -1,39 +1,40 @@ - \ No newline at end of file Index: branches/2.8.x/wb/modules/news/languages/DE.php =================================================================== --- branches/2.8.x/wb/modules/news/languages/DE.php (revision 1457) +++ branches/2.8.x/wb/modules/news/languages/DE.php (revision 1458) @@ -1,39 +1,41 @@ - \ No newline at end of file