Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1408) +++ branches/2.8.x/CHANGELOG (revision 1409) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- +23 Jan-2011 Build 1409 Frank Heyne (FrankH) ++ Ticket 1058 added warn_page_leave (currently only in wysiwyg) 23 Jan-2011 Build 1408 Werner v.d.Decken(DarkViper) # small changes in sm2menu() [SM2_NO_TITLE + SM2_XHTML_STRICT] 22 Jan-2011 Build 1407 Frank Heyne (FrankH) Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1408) +++ branches/2.8.x/wb/upgrade-script.php (revision 1409) @@ -270,6 +270,18 @@ } /********************************************************** + * - Adding field warn_page_leave to settings table + */ +echo "
Adding warn_page_leave to settings table
"; +$cfg = array( + 'warn_page_leave' => '1' +); + +foreach($cfg as $key=>$value) { + db_add_key_value($key, $value); +} + +/********************************************************** * - install droplets */ $drops = (!in_array ( "mod_droplets", $all_tables)) ? "
Install droplets
" : "
Upgrade droplets
"; Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1408) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1409) @@ -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.RC5'); -if(!defined('REVISION')) define('REVISION', '1408'); +if(!defined('REVISION')) define('REVISION', '1409'); ?> Index: branches/2.8.x/wb/admin/settings/index.php =================================================================== --- branches/2.8.x/wb/admin/settings/index.php (revision 1408) +++ branches/2.8.x/wb/admin/settings/index.php (revision 1409) @@ -363,6 +363,14 @@ $template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"'); } + // Work-out if warn_page_leave feature is enabled + if (defined('WARN_PAGE_LEAVE') && WARN_PAGE_LEAVE == true) + { + $template->set_var('WARN_PAGE_LEAVE_ENABLED', ' checked="checked"'); + } else { + $template->set_var('WARN_PAGE_LEAVE_DISABLED', ' checked="checked"'); + } + // Work-out if smart login feature is enabled if(defined('SMART_LOGIN') && SMART_LOGIN == true) { @@ -682,6 +690,7 @@ 'TEXT_READ' => $TEXT['READ'], 'TEXT_WRITE' => $TEXT['WRITE'], 'TEXT_EXECUTE' => $TEXT['EXECUTE'], + 'TEXT_WARN_PAGE_LEAVE' => $TEXT['WARN_PAGE_LEAVE'], 'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'], 'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'], 'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'], Index: branches/2.8.x/wb/templates/wb_theme/templates/settings.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/settings.htt (revision 1408) +++ branches/2.8.x/wb/templates/wb_theme/templates/settings.htt (revision 1409) @@ -134,6 +134,15 @@ + {TEXT_WARN_PAGE_LEAVE}: + + + + + + + + {TEXT_SMART_LOGIN}: Index: branches/2.8.x/wb/templates/argos_theme/templates/settings.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/settings.htt (revision 1408) +++ branches/2.8.x/wb/templates/argos_theme/templates/settings.htt (revision 1409) @@ -125,6 +125,15 @@ + {TEXT_WARN_PAGE_LEAVE}: + + + + + + + + {TEXT_SMART_LOGIN}: Index: branches/2.8.x/wb/install/save.php =================================================================== --- branches/2.8.x/wb/install/save.php (revision 1408) +++ branches/2.8.x/wb/install/save.php (revision 1409) @@ -459,6 +459,7 @@ ." ('default_time_format', 'g:i A')," ." ('redirect_timer', '1500')," ." ('home_folders', 'true')," + ." ('warn_page_leave', '1')," ." ('default_template', 'round')," ." ('default_theme', 'wb_theme')," ." ('default_charset', 'utf-8')," Index: branches/2.8.x/wb/languages/EN.php =================================================================== --- branches/2.8.x/wb/languages/EN.php (revision 1408) +++ branches/2.8.x/wb/languages/EN.php (revision 1409) @@ -363,6 +363,7 @@ $TEXT['VIEW_DELETED_PAGES'] = 'View Deleted Pages'; $TEXT['VIEW_DETAILS'] = 'View Details'; $TEXT['VISIBILITY'] = 'Visibility'; +$TEXT['WARN_PAGE_LEAVE'] = 'Warn when leaving page'; $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Default From Mail'; $TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Default Sender Name'; $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Please specify a default "FROM" address and "SENDER" name below. It is recommended to use a FROM address like: admin@yourdomain.com. Some mail provider (e.g. mail.com) may reject mails with a FROM: address like name@mail.com sent via a foreign relay to avoid spam.

The default values are only used if no other values are specified by WebsiteBaker. If your server supports SMTP, you may want use this option for outgoing mails.'; Index: branches/2.8.x/wb/languages/DE.php =================================================================== --- branches/2.8.x/wb/languages/DE.php (revision 1408) +++ branches/2.8.x/wb/languages/DE.php (revision 1409) @@ -364,6 +364,7 @@ $TEXT['VIEW_DELETED_PAGES'] = 'gelöschte Seiten anschauen'; $TEXT['VIEW_DETAILS'] = 'Details'; $TEXT['VISIBILITY'] = 'Sichtbarkeit'; +$TEXT['WARN_PAGE_LEAVE'] = 'Warnung bei Seitenwechsel'; $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Standard "VON" Adresse'; $TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Standard Absender Name'; $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Bitte geben Sie eine Standard "VON" Adresse und einen Sendernamen an. Als Absender Adresse empfiehlt sich ein Format wie: admin@IhreWebseite.de. Manche E-Mail Provider (z.B. mail.de) stellen keine E-Mails zu, die nicht über den Provider selbst verschickt wurden, in der Absender Adresse aber den Namen des E-Mail Providers name@mail.de enthalten. Die Standard Werte werden nur verwendet, wenn keine anderen Werte von WebsiteBaker gesetzt wurden. Wenn Ihr Service Provider SMTP anbietet, sollten Sie diese Option für ausgehende E-Mails verwenden.'; Index: branches/2.8.x/wb/modules/wysiwyg/modify.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/modify.php (revision 1408) +++ branches/2.8.x/wb/modules/wysiwyg/modify.php (revision 1409) @@ -46,14 +46,27 @@ ?> -
+ + + getFTAN()."\n"; -show_wysiwyg_editor('content'.$section_id,'content'.$section_id,$content,'100%','350px'); +show_wysiwyg_editor('content'.$section_id,'content'.$section_id,$content,'100%','350'); ?>