Revision 1409
Added by FrankH almost 14 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
11 | 11 |
! = Update/Change |
12 | 12 |
|
13 | 13 |
------------------------------------- 2.8.2 ------------------------------------- |
14 |
23 Jan-2011 Build 1409 Frank Heyne (FrankH) |
|
15 |
+ Ticket 1058 added warn_page_leave (currently only in wysiwyg) |
|
14 | 16 |
23 Jan-2011 Build 1408 Werner v.d.Decken(DarkViper) |
15 | 17 |
# small changes in sm2menu() [SM2_NO_TITLE + SM2_XHTML_STRICT] |
16 | 18 |
22 Jan-2011 Build 1407 Frank Heyne (FrankH) |
branches/2.8.x/wb/upgrade-script.php | ||
---|---|---|
270 | 270 |
} |
271 | 271 |
|
272 | 272 |
/********************************************************** |
273 |
* - Adding field warn_page_leave to settings table |
|
274 |
*/ |
|
275 |
echo "<br />Adding warn_page_leave to settings table<br />"; |
|
276 |
$cfg = array( |
|
277 |
'warn_page_leave' => '1' |
|
278 |
); |
|
279 |
|
|
280 |
foreach($cfg as $key=>$value) { |
|
281 |
db_add_key_value($key, $value); |
|
282 |
} |
|
283 |
|
|
284 |
/********************************************************** |
|
273 | 285 |
* - install droplets |
274 | 286 |
*/ |
275 | 287 |
$drops = (!in_array ( "mod_droplets", $all_tables)) ? "<br />Install droplets<br />" : "<br />Upgrade droplets<br />"; |
branches/2.8.x/wb/admin/interface/version.php | ||
---|---|---|
52 | 52 |
|
53 | 53 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
54 | 54 |
if(!defined('VERSION')) define('VERSION', '2.8.2.RC5'); |
55 |
if(!defined('REVISION')) define('REVISION', '1408');
|
|
55 |
if(!defined('REVISION')) define('REVISION', '1409');
|
|
56 | 56 |
|
57 | 57 |
?> |
branches/2.8.x/wb/admin/settings/index.php | ||
---|---|---|
363 | 363 |
$template->set_var('PAGE_LANGUAGES_DISABLED', ' checked="checked"'); |
364 | 364 |
} |
365 | 365 |
|
366 |
// Work-out if warn_page_leave feature is enabled |
|
367 |
if (defined('WARN_PAGE_LEAVE') && WARN_PAGE_LEAVE == true) |
|
368 |
{ |
|
369 |
$template->set_var('WARN_PAGE_LEAVE_ENABLED', ' checked="checked"'); |
|
370 |
} else { |
|
371 |
$template->set_var('WARN_PAGE_LEAVE_DISABLED', ' checked="checked"'); |
|
372 |
} |
|
373 |
|
|
366 | 374 |
// Work-out if smart login feature is enabled |
367 | 375 |
if(defined('SMART_LOGIN') && SMART_LOGIN == true) |
368 | 376 |
{ |
... | ... | |
682 | 690 |
'TEXT_READ' => $TEXT['READ'], |
683 | 691 |
'TEXT_WRITE' => $TEXT['WRITE'], |
684 | 692 |
'TEXT_EXECUTE' => $TEXT['EXECUTE'], |
693 |
'TEXT_WARN_PAGE_LEAVE' => $TEXT['WARN_PAGE_LEAVE'], |
|
685 | 694 |
'TEXT_SMART_LOGIN' => $TEXT['SMART_LOGIN'], |
686 | 695 |
'TEXT_MULTIPLE_MENUS' => $TEXT['MULTIPLE_MENUS'], |
687 | 696 |
'TEXT_HOMEPAGE_REDIRECTION' => $TEXT['HOMEPAGE_REDIRECTION'], |
branches/2.8.x/wb/templates/wb_theme/templates/settings.htt | ||
---|---|---|
134 | 134 |
</td> |
135 | 135 |
</tr> |
136 | 136 |
<tr{DISPLAY_ADVANCED}> |
137 |
<td class="setting_name">{TEXT_WARN_PAGE_LEAVE}:</td> |
|
138 |
<td class="setting_value" colspan="2"> |
|
139 |
<input type="radio" name="warn_page_leave" id="warn_page_leave_true" style="width: 14px; height: 14px;" value="true"{WARN_PAGE_LEAVE_ENABLED} /> |
|
140 |
<label for="smart_login_true">{TEXT_ENABLED}</label> |
|
141 |
<input type="radio" name="warn_page_leave" id="warn_page_leave_false" style="width: 14px; height: 14px;" value="false"{WARN_PAGE_LEAVE_DISABLED} /> |
|
142 |
<label for="smart_login_false">{TEXT_DISABLED}</label> |
|
143 |
</td> |
|
144 |
</tr> |
|
145 |
<tr{DISPLAY_ADVANCED}> |
|
137 | 146 |
<td class="setting_name">{TEXT_SMART_LOGIN}:</td> |
138 | 147 |
<td class="setting_value" colspan="2"> |
139 | 148 |
<input type="radio" name="smart_login" id="smart_login_true" style="width: 14px; height: 14px;" value="true"{SMART_LOGIN_ENABLED} /> |
branches/2.8.x/wb/templates/argos_theme/templates/settings.htt | ||
---|---|---|
125 | 125 |
</td> |
126 | 126 |
</tr> |
127 | 127 |
<tr{DISPLAY_ADVANCED}> |
128 |
<td class="setting_name">{TEXT_WARN_PAGE_LEAVE}:</td> |
|
129 |
<td class="setting_value" colspan="2"> |
|
130 |
<input type="radio" name="warn_page_leave" id="warn_page_leave_true" style="width: 14px; height: 14px;" value="true"{WARN_PAGE_LEAVE_ENABLED} /> |
|
131 |
<label for="smart_login_true">{TEXT_ENABLED}</label> |
|
132 |
<input type="radio" name="warn_page_leave" id="warn_page_leave_false" style="width: 14px; height: 14px;" value="false"{WARN_PAGE_LEAVE_DISABLED} /> |
|
133 |
<label for="smart_login_false">{TEXT_DISABLED}</label> |
|
134 |
</td> |
|
135 |
</tr> |
|
136 |
<tr{DISPLAY_ADVANCED}> |
|
128 | 137 |
<td class="setting_name">{TEXT_SMART_LOGIN}:</td> |
129 | 138 |
<td class="setting_value" colspan="3"> |
130 | 139 |
<input type="radio" name="smart_login" id="smart_login_true" style="width: 14px; height: 14px;" value="true"{SMART_LOGIN_ENABLED} /> |
branches/2.8.x/wb/install/save.php | ||
---|---|---|
459 | 459 |
." ('default_time_format', 'g:i A')," |
460 | 460 |
." ('redirect_timer', '1500')," |
461 | 461 |
." ('home_folders', 'true')," |
462 |
." ('warn_page_leave', '1')," |
|
462 | 463 |
." ('default_template', 'round')," |
463 | 464 |
." ('default_theme', 'wb_theme')," |
464 | 465 |
." ('default_charset', 'utf-8')," |
branches/2.8.x/wb/languages/EN.php | ||
---|---|---|
363 | 363 |
$TEXT['VIEW_DELETED_PAGES'] = 'View Deleted Pages'; |
364 | 364 |
$TEXT['VIEW_DETAILS'] = 'View Details'; |
365 | 365 |
$TEXT['VISIBILITY'] = 'Visibility'; |
366 |
$TEXT['WARN_PAGE_LEAVE'] = 'Warn when leaving page'; |
|
366 | 367 |
$TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Default From Mail'; |
367 | 368 |
$TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Default Sender Name'; |
368 | 369 |
$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Please specify a default "FROM" address and "SENDER" name below. It is recommended to use a FROM address like: <strong>admin@yourdomain.com</strong>. Some mail provider (e.g. <em>mail.com</em>) may reject mails with a FROM: address like <em>name@mail.com</em> sent via a foreign relay to avoid spam.<br /><br />The default values are only used if no other values are specified by WebsiteBaker. If your server supports <acronym title="Simple mail transfer protocol">SMTP</acronym>, you may want use this option for outgoing mails.'; |
branches/2.8.x/wb/languages/DE.php | ||
---|---|---|
364 | 364 |
$TEXT['VIEW_DELETED_PAGES'] = 'gelöschte Seiten anschauen'; |
365 | 365 |
$TEXT['VIEW_DETAILS'] = 'Details'; |
366 | 366 |
$TEXT['VISIBILITY'] = 'Sichtbarkeit'; |
367 |
$TEXT['WARN_PAGE_LEAVE'] = 'Warnung bei Seitenwechsel'; |
|
367 | 368 |
$TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Standard "VON" Adresse'; |
368 | 369 |
$TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Standard Absender Name'; |
369 | 370 |
$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Bitte geben Sie eine Standard "VON" Adresse und einen Sendernamen an. Als Absender Adresse empfiehlt sich ein Format wie: <strong>admin@IhreWebseite.de</strong>. Manche E-Mail Provider (z.B. <em>mail.de</em>) stellen keine E-Mails zu, die nicht über den Provider selbst verschickt wurden, in der Absender Adresse aber den Namen des E-Mail Providers <em>name@mail.de</em> enthalten. Die Standard Werte werden nur verwendet, wenn keine anderen Werte von WebsiteBaker gesetzt wurden. Wenn Ihr Service Provider <acronym title="Simple Mail Transfer Protocol">SMTP</acronym> anbietet, sollten Sie diese Option für ausgehende E-Mails verwenden.'; |
branches/2.8.x/wb/modules/wysiwyg/modify.php | ||
---|---|---|
46 | 46 |
|
47 | 47 |
?> |
48 | 48 |
|
49 |
<form name="wysiwyg<?php echo $section_id; ?>" action="<?php echo WB_URL; ?>/modules/wysiwyg/save.php" method="post"> |
|
49 |
<script language="javascript" type="text/javascript"> |
|
50 |
//<![CDATA[ |
|
51 |
// Added to confirm leaving the page without saving changes first (even if there aren't any) |
|
52 |
var needToConfirm = <?php echo WARN_PAGE_LEAVE; ?>; |
|
53 |
window.onbeforeunload = confirmExit; |
|
54 |
function confirmExit() |
|
55 |
{ |
|
56 |
if (needToConfirm) |
|
57 |
return "<?php print(html_entity_decode($MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'], ENT_NOQUOTES, 'UTF-8')); ?>"; |
|
58 |
} |
|
59 |
//]]> |
|
60 |
</script> |
|
50 | 61 |
|
62 |
<form name="wysiwyg<?php echo $section_id; ?>" action="<?php echo WB_URL; ?>/modules/wysiwyg/save.php" method="post" onclick="needToConfirm=false;"> |
|
63 |
|
|
51 | 64 |
<input type="hidden" name="page_id" value="<?php echo $page_id; ?>" /> |
52 | 65 |
<input type="hidden" name="section_id" value="<?php echo $section_id; ?>" /> |
53 | 66 |
|
54 | 67 |
<?php |
55 | 68 |
echo $admin->getFTAN()."\n"; |
56 |
show_wysiwyg_editor('content'.$section_id,'content'.$section_id,$content,'100%','350px');
|
|
69 |
show_wysiwyg_editor('content'.$section_id,'content'.$section_id,$content,'100%','350'); |
|
57 | 70 |
?> |
58 | 71 |
|
59 | 72 |
<table cellpadding="0" cellspacing="0" border="0" width="100%" style="padding-bottom: 10px;"> |
Also available in: Unified diff
+ Ticket 1058 added warn_page_leave (currently only in wysiwyg)