Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 981) +++ trunk/CHANGELOG (revision 982) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.0 ------------------------------------- +21-May-2009 Matthias Gallas +# Fixed some strange backend layout issues (ticket #722) 09-May-2009 Matthias Gallas + Added index.php to all WB-Theme folders to prevent directory spoofing 06-May-2009 Matthias Gallas Index: trunk/wb/templates/classic/theme.css =================================================================== --- trunk/wb/templates/classic/theme.css (revision 981) +++ trunk/wb/templates/classic/theme.css (revision 982) @@ -225,9 +225,13 @@ } .setting_name { - width: 180px; + width: 20%; } +.setting_value { + width: 80%; +} + .setting_value input, .setting_value select, .setting_value textarea { width: 100%; } Index: trunk/wb/templates/wb_theme/theme.css =================================================================== --- trunk/wb/templates/wb_theme/theme.css (revision 981) +++ trunk/wb/templates/wb_theme/theme.css (revision 982) @@ -226,9 +226,13 @@ } .setting_name { - width: 180px; + width: 20%; } +.setting_value { + width: 80%; +} + .setting_value input, .setting_value select, .setting_value textarea { width: 100%; } Index: trunk/wb/modules/form/modify_settings.php =================================================================== --- trunk/wb/modules/form/modify_settings.php (revision 981) +++ trunk/wb/modules/form/modify_settings.php (revision 982) @@ -1,262 +1,262 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -/* -The Website Baker Project would like to thank Rudolph Lartey -for his contributions to this module - adding extra field types -*/ - -require('../../config.php'); - -// Include WB admin wrapper script -require(WB_PATH.'/modules/admin.php'); - -// include core functions of WB 2.7 to edit the optional module CSS files (frontend.css, backend.css) -@include_once(WB_PATH .'/framework/module.functions.php'); - -// check if module language file exists for the language set by the user (e.g. DE, EN) -if(!file_exists(WB_PATH .'/modules/form/languages/'.LANGUAGE .'.php')) { - // no module language file exists for the language set by the user, include default module language file EN.php - require_once(WB_PATH .'/modules/form/languages/EN.php'); -} else { - // a module language file exists for the language defined by the user, load it - require_once(WB_PATH .'/modules/form/languages/'.LANGUAGE .'.php'); -} - -// Get header and footer -$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'"); -$setting = $query_content->fetchRow(); - -// Set raw html <'s and >'s to be replace by friendly html code -$raw = array('<', '>'); -$friendly = array('<', '>'); - -// check if backend.css file needs to be included into the of modify.php -if(!method_exists($admin, 'register_backend_modfiles') && file_exists(WB_PATH ."/modules/form/backend.css")) { - echo '\n"; -} - -?> -

- construct!!! -if(function_exists('edit_module_css')) { - edit_module_css('form'); -} -?> - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - /> - - /> - -
: - -
: - -
: - -
: - -
: - -
- - - - - - - - - - - - - - - - - - - - - -
: - -
: - - -
: - -
: - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - -
: - -
: - -
: - -
: - -
: - -
- - - - - - -
- - - -
- -print_footer(); - + + Copyright (C) 2004-2009, Ryan Djurovich + + Website Baker is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Website Baker is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Website Baker; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +/* +The Website Baker Project would like to thank Rudolph Lartey +for his contributions to this module - adding extra field types +*/ + +require('../../config.php'); + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// include core functions of WB 2.7 to edit the optional module CSS files (frontend.css, backend.css) +@include_once(WB_PATH .'/framework/module.functions.php'); + +// check if module language file exists for the language set by the user (e.g. DE, EN) +if(!file_exists(WB_PATH .'/modules/form/languages/'.LANGUAGE .'.php')) { + // no module language file exists for the language set by the user, include default module language file EN.php + require_once(WB_PATH .'/modules/form/languages/EN.php'); +} else { + // a module language file exists for the language defined by the user, load it + require_once(WB_PATH .'/modules/form/languages/'.LANGUAGE .'.php'); +} + +// Get header and footer +$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_settings WHERE section_id = '$section_id'"); +$setting = $query_content->fetchRow(); + +// Set raw html <'s and >'s to be replace by friendly html code +$raw = array('<', '>'); +$friendly = array('<', '>'); + +// check if backend.css file needs to be included into the of modify.php +if(!method_exists($admin, 'register_backend_modfiles') && file_exists(WB_PATH ."/modules/form/backend.css")) { + echo '\n"; +} + +?> +

+ construct!!! +if(function_exists('edit_module_css')) { + edit_module_css('form'); +} +?> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: + /> + + /> + +
: + +
: + +
: + +
: + +
: + +
+ + + + + + + + + + + + + + + + + + + + + +
: + +
: + + +
: + +
: + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: + +
: + +
: + +
: + +
: + +
: + +
+ + + + + + +
+ + + +
+ +print_footer(); + ?> \ No newline at end of file Index: trunk/wb/modules/form/backend.css =================================================================== --- trunk/wb/modules/form/backend.css (revision 981) +++ trunk/wb/modules/form/backend.css (revision 982) @@ -1,6 +1,11 @@ .setting_name { vertical-align: top; + width: 30%; } +.setting_value { + vertical-align: top; + width: 70%; +} .newsection { border-top: 1px dashed #fff; } Index: trunk/wb/modules/news/modify_settings.php =================================================================== --- trunk/wb/modules/news/modify_settings.php (revision 981) +++ trunk/wb/modules/news/modify_settings.php (revision 982) @@ -1,210 +1,208 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -require('../../config.php'); - -// Include WB admin wrapper script -require(WB_PATH.'/modules/admin.php'); - -// include core functions of WB 2.7 to edit the optional module CSS files (frontend.css, backend.css) -@include_once(WB_PATH .'/framework/module.functions.php'); - -// check if module language file exists for the language set by the user (e.g. DE, EN) -if(!file_exists(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php')) { - // no module language file exists for the language set by the user, include default module language file EN.php - require_once(WB_PATH .'/modules/news/languages/EN.php'); -} else { - // a module language file exists for the language defined by the user, load it - require_once(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php'); -} - -// Get header and footer -$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); -$fetch_content = $query_content->fetchRow(); - -// Set raw html <'s and >'s to be replace by friendly html code -$raw = array('<', '>'); -$friendly = array('<', '>'); - -// check if backend.css file needs to be included into the of modify.php -if(!method_exists($admin, 'register_backend_modfiles') && file_exists(WB_PATH ."/modules/form/backend.css")) { - echo '\n"; -} - -?> -

- construct!!! -if(function_exists('edit_module_css')) { - edit_module_css('news'); -} -?> - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - -
: - -
: - -
: - -
: - -
: - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - -
: - /> - - /> - -
- : - - -
: - -
: - -
: - -
: - -
- - - - - -
- - - -
- - -print_footer(); - + + Copyright (C) 2004-2009, Ryan Djurovich + + Website Baker is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Website Baker is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Website Baker; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +require('../../config.php'); + +// Include WB admin wrapper script +require(WB_PATH.'/modules/admin.php'); + +// include core functions of WB 2.7 to edit the optional module CSS files (frontend.css, backend.css) +@include_once(WB_PATH .'/framework/module.functions.php'); + +// check if module language file exists for the language set by the user (e.g. DE, EN) +if(!file_exists(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php')) { + // no module language file exists for the language set by the user, include default module language file EN.php + require_once(WB_PATH .'/modules/news/languages/EN.php'); +} else { + // a module language file exists for the language defined by the user, load it + require_once(WB_PATH .'/modules/news/languages/'.LANGUAGE .'.php'); +} + +// Get header and footer +$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings WHERE section_id = '$section_id'"); +$fetch_content = $query_content->fetchRow(); + +// Set raw html <'s and >'s to be replace by friendly html code +$raw = array('<', '>'); +$friendly = array('<', '>'); + +// check if backend.css file needs to be included into the of modify.php +if(!method_exists($admin, 'register_backend_modfiles') && file_exists(WB_PATH ."/modules/form/backend.css")) { + echo '\n"; +} + +?> +

+ construct!!! +if(function_exists('edit_module_css')) { + edit_module_css('news'); +} +?> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: + +
: + +
: + +
: + +
: + +
: + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: + +
: + /> + + /> + +
: + +
: + +
: + +
: + +
: + +
+ + + + + +
+ + + +
+ + +print_footer(); + ?> \ No newline at end of file Index: trunk/wb/modules/news/backend.css =================================================================== --- trunk/wb/modules/news/backend.css (revision 981) +++ trunk/wb/modules/news/backend.css (revision 982) @@ -1,6 +1,11 @@ .setting_name { vertical-align: top; + width: 20%; } +.setting_value { + vertical-align: top; + width: 80%; +} /* The definitions below provide the style for the edit CSS button