Revision 1274
Added by Luisehahne almost 16 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
|
| 13 | 13 |
------------------------------------- 2.8.1 ------------------------------------- |
| 14 |
24-Jan-2010 Dietmar Woellbrink (Luisehahne) |
|
| 15 |
# Ticket #921 fix issues in IE by using EditArea framework |
|
| 14 | 16 |
23-Jan-2010 Dietmar Woellbrink (Luisehahne) |
| 15 | 17 |
! Ticket #921 Update EditArea framework |
| 16 | 18 |
! fix stylings wb_them |
| branches/2.8.x/wb/include/editarea/wb_wrapper_edit_area.php | ||
|---|---|---|
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 | 63 |
if (!function_exists('registerEditArea')) {
|
| 64 |
function registerEditArea($id = 'code_area', $syntax = 'php', $syntax_selection = true |
|
| 65 |
, $allow_resize = 'both', $allow_toggle = true, $start_highlight = true |
|
| 66 |
, $min_width = 600, $min_height = 300, $toolbar = 'default') |
|
| 64 |
function registerEditArea( |
|
| 65 |
$id = 'code_area', |
|
| 66 |
$syntax = 'php', |
|
| 67 |
$syntax_selection = true, |
|
| 68 |
$allow_resize = 'both', |
|
| 69 |
$allow_toggle = true, |
|
| 70 |
$start_highlight = true, |
|
| 71 |
$min_width = 600, |
|
| 72 |
$min_height = 300, |
|
| 73 |
$toolbar = 'default' |
|
| 74 |
) |
|
| 67 | 75 |
{
|
| 68 | 76 |
|
| 69 | 77 |
// set default toolbar if no user defined was specified |
| ... | ... | |
| 74 | 82 |
|
| 75 | 83 |
// check if used Website Baker backend language is supported by EditArea |
| 76 | 84 |
$language = 'en'; |
| 77 |
if (defined('LANGUAGE') && file_exists(dirname(__FILE__) . '/langs/' . strtolower(LANGUAGE) . '.js')) {
|
|
| 85 |
if (defined('LANGUAGE') && file_exists(dirname(__FILE__) . '/langs/' . strtolower(LANGUAGE) . '.js'))
|
|
| 86 |
{
|
|
| 78 | 87 |
$language = strtolower(LANGUAGE); |
| 79 | 88 |
} |
| 80 | 89 |
|
| ... | ... | |
| 84 | 93 |
// check if resize option is supported by edit_area |
| 85 | 94 |
$allow_resize = in_array($allow_resize, array('no', 'both', 'x', 'y')) ? $allow_resize : 'no';
|
| 86 | 95 |
|
| 87 |
loader_help(); |
|
| 88 | 96 |
// return the Javascript code |
| 89 | 97 |
$result = <<< EOT |
| 90 | 98 |
<script type="text/javascript"> |
| 91 | 99 |
editAreaLoader.init({
|
| 92 |
id: '$id' |
|
| 93 |
,start_highlight: $start_highlight
|
|
| 94 |
,syntax: '$syntax'
|
|
| 95 |
,min_width: $min_width
|
|
| 96 |
,min_height: $min_height
|
|
| 97 |
,allow_resize: '$allow_resize'
|
|
| 98 |
,allow_toggle: $allow_toggle
|
|
| 99 |
,toolbar: '$toolbar'
|
|
| 100 |
,language: '$language'
|
|
| 100 |
id: '$id',
|
|
| 101 |
start_highlight: $start_highlight,
|
|
| 102 |
syntax: '$syntax',
|
|
| 103 |
min_width: $min_width,
|
|
| 104 |
min_height: $min_height,
|
|
| 105 |
allow_resize: '$allow_resize',
|
|
| 106 |
allow_toggle: $allow_toggle,
|
|
| 107 |
toolbar: '$toolbar',
|
|
| 108 |
language: '$language' |
|
| 101 | 109 |
}); |
| 102 | 110 |
</script> |
| 103 | 111 |
EOT; |
| 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.1');
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1273');
|
|
| 55 |
if(!defined('REVISION')) define('REVISION', '1274');
|
|
| 56 | 56 |
|
| 57 | 57 |
?> |
| branches/2.8.x/wb/templates/classic_theme/templates/header.htt | ||
|---|---|---|
| 15 | 15 |
var THEME_URL = '{THEME_URL}';
|
| 16 | 16 |
var ADMIN_URL = '{ADMIN_URL}';
|
| 17 | 17 |
</script> |
| 18 |
<script src="{WB_URL}/include/editarea/edit_area_full.js" type="text/javascript"></script>
|
|
| 18 | 19 |
{BACKEND_MODULE_JS}
|
| 19 | 20 |
<script language="javascript" type="text/javascript"> |
| 20 | 21 |
function confirm_link(message, url) {
|
| branches/2.8.x/wb/templates/wb_theme/templates/header.htt | ||
|---|---|---|
| 14 | 14 |
var THEME_URL = '{THEME_URL}';
|
| 15 | 15 |
var ADMIN_URL = '{ADMIN_URL}';
|
| 16 | 16 |
</script> |
| 17 |
<script src="{WB_URL}/include/editarea/edit_area_full.js" type="text/javascript"></script>
|
|
| 17 | 18 |
{BACKEND_MODULE_JS}
|
| 18 | 19 |
<script language="javascript" type="text/javascript"> |
| 19 | 20 |
function confirm_link(message, url) {
|
| branches/2.8.x/wb/templates/argos_theme/templates/header.htt | ||
|---|---|---|
| 17 | 17 |
var THEME_URL = '{THEME_URL}';
|
| 18 | 18 |
var ADMIN_URL = '{ADMIN_URL}';
|
| 19 | 19 |
</script> |
| 20 |
<script src="{WB_URL}/include/editarea/edit_area_full.js" type="text/javascript"></script>
|
|
| 20 | 21 |
{BACKEND_MODULE_JS}
|
| 21 | 22 |
<script language="javascript" type="text/javascript"> |
| 22 | 23 |
function confirm_link(message, url) {
|
| branches/2.8.x/wb/modules/edit_module_files.php | ||
|---|---|---|
| 60 | 60 |
die; |
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 |
// register the textarea to use edit_area |
|
| 64 |
echo (function_exists('registerEditArea')) ? registerEditArea('code_area', 'css', false) : '';
|
|
| 63 |
echo (function_exists('registerEditArea')) ? registerEditArea('code_area', 'css', false) : 'none';
|
|
| 65 | 64 |
|
| 66 | 65 |
// set default text output if varibles are not defined in the global WB language files |
| 67 | 66 |
$HEADING_CSS_FILE = (isset($GLOBALS['TEXT']['HEADING_CSS_FILE'])) ?$GLOBALS['TEXT']['HEADING_CSS_FILE'] :'Actual module file: '; |
Also available in: Unified diff
Ticket #921 fix issues in IE by using EditArea framework