Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1224) +++ branches/2.8.x/CHANGELOG (revision 1225) @@ -12,6 +12,8 @@ ------------------------------------- 2.8.1 ------------------------------------- 28-Dec-2009 Dietmar Woellbrink (Luisehahne) +! update header, change variable +28-Dec-2009 Dietmar Woellbrink (Luisehahne) ! update header 28-Dec-2009 Dietmar Woellbrink (Luisehahne) ! update header Index: branches/2.8.x/wb/admin/pages/settings.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings.php (revision 1224) +++ branches/2.8.x/wb/admin/pages/settings.php (revision 1225) @@ -1,37 +1,63 @@ +* Copyright (C) 2009, Website Baker Org. e.V. +* http://start.websitebaker2.org/impressum-datenschutz.php +* Copyright (C) 2004-2009, Ryan Djurovich +* +* About WebsiteBaker +* +* Website Baker is a PHP-based Content Management System (CMS) +* designed with one goal in mind: to enable its users to produce websites +* with ease. +* +***************************************************************************** +* +***************************************************************************** +* LICENSE INFORMATION +* +* WebsiteBaker 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. +* +* WebsiteBaker 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 this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +**************************************************************************** +* +***************************************************************************** +* WebsiteBaker Extra Information +* +* +* +* +*****************************************************************************/ +/** + * @category admin + * @package pages + * @author Ryan Djurovich + * @copyright 2004-2009, Ryan Djurovich + * @copyright 2009, Website Baker Org. e.V. + * @version $Id$ + * @platform WebsiteBaker 2.8.x + * @requirements >= PHP 4.3.4 + * @license http://www.gnu.org/licenses/gpl.html + * + */ -// $Id$ - -/* - - Website Baker Project - 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 - - * @category backend - * @package pages - * @author(s) Dietmar Wöllbrink , Dietrich Roland Pehlke - * @platform WB 2.8.x - * @require PHP 5.2.11 - * @license http://www.gnu.org/licenses/gpl.html - * @link http://project.websitebaker2.org/browser/branches/2.8.x/wb/pages - * @changeset 2009/11/30 workout for page_code field, ex catchwords and multilangial - -*/ - // Get page id if(!isset($_GET['page_id']) OR !is_numeric($_GET['page_id'])) { header("Location: index.php"); @@ -69,7 +95,7 @@ } // Get page details -$database = new database(); +/* $database = new database(); */ $query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'"; $results = $database->query($query); if($database->is_error()) { @@ -155,24 +181,6 @@ ) ); $template->parse('group_list', 'group_list_block', true); - /* - if(!in_array(1, $admin->get_groups_id())) { - $users_groups = $admin->get_groups_name(); - foreach ($admin->get_groups_id() as $users_group_id) { - $template->set_var(array( - 'ID' => $users_group_id, - 'TOGGLE' => '', - 'DISABLED' => ' disabled', - 'LINK_COLOR' => '000000', - 'CURSOR' => 'default', - 'NAME' => $users_groups[$users_group_id], - 'CHECKED' => ' checked' - ) - ); - $template->parse('group_list', 'group_list_block', true); - } - } - */ while($group = $get_groups->fetchRow()) { // check if the user is a member of this group $flag_disabled = ''; @@ -228,7 +236,6 @@ ); $template->parse('group_list2', 'group_list_block2', true); - while($group = $get_groups->fetchRow()) { // check if the user is a member of this group $flag_disabled = ''; @@ -269,7 +276,7 @@ //-- insert page_code 20090904--> $template->set_var('DISPLAY_CODE_PAGE_LIST', ' id="multi_lingual" style="display:none;"'); // Work-out if page languages feature is enabled -if((defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) && $field_set) +if((defined('PAGE_LANGUAGES') && PAGE_LANGUAGES) && $field_set && file_exists(WB_URL.'/modules/mod_multilingual/update_keys.php')) { // workout field is set but module missing $TEXT['PAGE_CODE'] = empty($TEXT['PAGE_CODE']) ? 'Pagecode' : $TEXT['PAGE_CODE']; @@ -279,9 +286,8 @@ ) ); - // Page_code list - $database = new database(); + /* $database = new database(); */ function page_code_list($parent) { global $admin, $database, $template, $results_array, $pageCode; $default_language = DEFAULT_LANGUAGE; @@ -315,12 +321,14 @@ } else { $can_modify = false; } - // Title -'s prefix + $title_prefix = ''; - for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - - '; } + for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - -  '; } + // $space = str_repeat(' ', 3); $space.'<'..'>' $template->set_var(array( 'VALUE' => $page['page_code'], - 'PAGE_CODE' => ($title_prefix.$page['menu_title']) + 'PAGE_VALUE' => $title_prefix.$page['page_code'], + 'PAGE_CODE' => $title_prefix.$page['menu_title'] ) ); if($results_array['page_code'] == $page['page_code']) { @@ -346,6 +354,7 @@ $template->set_var(array( 'VALUE' => '', 'PAGE_CODE' => $TEXT['NONE'], + 'PAGE_VALUE' => '', 'SELECTED' => $selected ) ); @@ -357,7 +366,7 @@ //-- page code --> // Parent page list -$database = new database(); +/* $database = new database(); */ function parent_list($parent) { global $admin, $database, $template, $results_array,$field_set; $query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' ORDER BY position ASC"; Index: branches/2.8.x/wb/templates/wb_theme/theme.css =================================================================== --- branches/2.8.x/wb/templates/wb_theme/theme.css (revision 1224) +++ branches/2.8.x/wb/templates/wb_theme/theme.css (revision 1225) @@ -1,419 +1,421 @@ -html {overflow: -moz-scrollbars-vertical;} /* Force firefox to always show room for a vertical scrollbar */ -body,td,th,input,textarea { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: #000000; -} - -body { - background-color: #A8BCCB; - /*background-image: url(images/background.png);*/ - background-repeat: repeat-x; - margin: auto; -} - -img { - border: 0px; -} - -form { - margin: 0; -} - -hr { - margin: 15px 0px 15px 0px; - color: #003366; - height: 1px; -} - -h1 { - text-align: center; - font-size: 20px; - color: #000000; - text-transform: uppercase; -} - -h2 { - font-size: 15px; - color: #336699; - margin: 5px 0px 5px 0px; -} - -h4 { - margin: 0; - border-bottom: 1px solid #DDD; - padding-bottom: 5px; -} - -a:link, a:visited, a:active { - color: #003366; - text-decoration: none; -} - -a:hover { - text-decoration: none; - color: #336699; -} - -ul, li { - list-style: none; - margin: 0; - padding: 0; -} - -label { - cursor: pointer; -} - -input:focus, input:active, select:focus, textarea:focus { - background: #F1F8FD; -} - -iframe { - border: 1px solid #35373a; -} - -div.box { - font-size: small; - width: 100%; - text-align: right; - margin: -10px 0 0 0; -} - -.header { - width: 900px; - margin: 0 auto; -} - -.container { - background: #fff url(images/bgtitle.png); - background-repeat: repeat-x; - width: 85%; - margin: 0 auto; -} - -.content { - padding: 20px; - height: 280px; - width: 750px; - text-align: left; - vertical-align: top; -} - -.current a, .current a:link, .current a:active, .current a:visited { - background: #fff url(images/menuo.png); - background-repeat: repeat-x; - color: #fff; -} - -.description { - vertical-align: top; - text-align: left; - width: 240px; - padding: 0px 0px 0px 3px; -} - -.graphic { - width: 50px; - height: 50px; - border: 4px solid #FDFDFD; - padding-left: 3px; -} - -.graphic img { - vertical-align: middle; - background-color: #FFFFFF; - padding: 3px 12px 3px 3px; - margin-right: 12px; - border-right: 3px solid silver; -} - -.hide { - display: none; -} - -.menu { - margin: 0; - padding: 0; - padding-top: 8px; - padding-bottom: 10px; - padding-left: 8px; - background: #000 url(images/menu.png); - background-repeat: repeat-x; -} - -.menu li { - list-style-type: none; - display: inline; - padding-right: 1px; -} - -.menu a, .menu a:link, .menu a:active, .menu a:visited { - border-bottom: 0; - padding: 7px 11px 9px 11px; - color: #fff; -} - -.menu a:hover { - text-decoration: none; - color: #fff; - background: #fff url(images/menuo.png); - background-repeat: repeat-x; -} - -.note { - color: #666666; - font-size: 10px; -} - -.pages_list .icon_col td img { - display: block; - border-style: none; - float: left; - padding-right: 7px; -} - -.pages_list table { - width: 100%; - margin: 0 auto; - background-color: #DCDCDC; -} - -.pages_list table td { - padding: 3px; -} - -.pages_list ul {margin:0;font-weight:normal; padding: 0px;} -.pages_list ul li {list-style-type:none;margin:2px 0; padding:0px;} - -.page_list { - display: none; -} - -.page_list_show li { - display: block; -} - -img.page_list_rights { - border: none; - margin-right: 5px; - float: left; - margin-top: 2px; - margin-bottom: 2px; -} - -.content input { - font-size: 12px; -} -.row_a { - background-color: #ECF3F7; -} - -.row_b { - background-color: #DBEBF2; -} - -.save, .reset { - width: 100px; -} - -.section { - margin-top: 10px; - padding: 0px; - /*border: 1px solid #999999;*/ - height: 75px; - width: 100%; - background-color: #FDFDFD; -} - -.sections_header { - width: 100%; - height: 50px; - margin-bottom: 10px; - background-color: #F0F0F0; - border: none; -} - -.sections_header td { - padding: 5px; -} - -.settings_table td { - vertical-align: top; - text-align: left; -} - -.setting_name { - width: 20%; -} - -.setting_value { - width: 80%; -} - -.setting_value input, .setting_value select, .setting_value textarea { - width: 100%; -} - -.setting_value textarea { - height: 50px; -} - -.title { - width: 90%; - text-align: left; - font-weight: bold; - font-size: 14px; - color: #003366; - height: 16px; - padding: 4px 0px 0px 3px; -} - -.tool_table td { - vertical-align: top; - text-align: left; -} - -.tool_table ul { - margin: 0; - padding: 0; - margin-left: 20px; - margin-bottom: 10px; -} - -.tool_table li { - padding-bottom: 5px; - list-style-type: disc; -} - -.value_input input, .value_input text, .value_input select { - width: 100%; -} - -#file_mode input { - width: 12px; - height: 12px; -} - -#dir_mode input { - width: 12px; - height: 12px; -} - -#hide2 { - display: none; -} - -/* CSS STYLES FOR THE PAGES SECTION */ - -table.pages_view { - width: 100%; - margin: 0 auto; - border: 0; - border-spacing: 0px; - background-color: #ECF3F7; -} - -table.pages_view td { - padding: 3px; -} - -table.pages_view tr:hover { - background-color: #F1F8DD; -} - -/* FORMS */ - -.submit, .cancel { - width: 100px; - margin-top: 5px; -} - -.form_submit { - width: 100%; -} - -.form_submit .left { - text-align: left; -} - -.form_submit .right { - text-align: right; -} - -.input_small { - width: 20px; -} - -.input_narrow { - width: 100px; -} - -.input_normal { - width: 120px; -} - -.input_medium { - width: 150px; -} - -.input_wide { - width: 200px; -} - -.input_large { - width: 300px; -} - -.input_full { - width: 100%; -} - -select option.disabled { - color: #aaa; -} - -.jsadmin_drag img { - padding: 3px 0; - margin-top: 1px; - vertical-align: top; - cursor: pointer; -} - -.modify_link { - vertical-align: middle; - padding-top: 4px; - display: inline; -} - -.header_title { - width: 100%; -} -.header_list_menu_title {text-align:left;} -.header_list_page_title {width:300px; text-align:left;} -.header_list_page_id {width:50px; text-align: right; padding-right:15px;} -.header_list_actions {width:150px; text-align:left;} - -.list_menu_title {text-align:left;} -.list_page_title {width:300px;text-align:left; } - -.list_page_id {width:30px;text-align: right; } -.list_actions {width:20px;text-align:left;} - -.sections_list {font-weight:bold;padding-left:10px;} -.sections_list table {width:900px;} - - -.header_list_type {text-align:left;} -.header_list_block {text-align:left;width:180px;} -.header_list_pubdate_start {text-align:left;width:200px;} -.header_list_pubdate_end {text-align:left;width:200px;} -.header_list_sections_actions {text-align:left;width:30px;} -.header_list_section_id {width:30px;text-align:right;} - - -.list_section_id {width:30px;text-align:right;} -.list_pubdate_start {text-align:left;width:200px;} -.list_pubdate_end {text-align:left;width:200px;} - +html {overflow: -moz-scrollbars-vertical;} /* Force firefox to always show room for a vertical scrollbar */ +body,td,th,input,textarea { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + color: #000000; +} + +body { + background-color: #A8BCCB; + /*background-image: url(images/background.png);*/ + background-repeat: repeat-x; + margin: auto; +} + +img { + border: 0px; +} + +form { + margin: 0; +} + +hr { + margin: 15px 0px 15px 0px; + color: #003366; + height: 1px; +} + +h1 { + text-align: center; + font-size: 20px; + color: #000000; + text-transform: uppercase; +} + +h2 { + font-size: 15px; + color: #336699; + margin: 5px 0px 5px 0px; +} + +h4 { + margin: 0; + border-bottom: 1px solid #DDD; + padding-bottom: 5px; +} + +a:link, a:visited, a:active { + color: #003366; + text-decoration: none; +} + +a:hover { + text-decoration: none; + color: #336699; +} + +ul, li { + list-style: none; + margin: 0; + padding: 0; +} + +label { + cursor: pointer; +} + +input:focus, input:active, select:focus, textarea:focus { + background: #F1F8FD; +} + +iframe { + border: 1px solid #35373a; +} + +div.box { + font-size: small; + width: 100%; + text-align: right; + margin: -10px 0 0 0; +} + +.header { + width: 900px; + margin: 0 auto; +} + +.container { + background: #fff url(images/bgtitle.png); + background-repeat: repeat-x; + width: 85%; + margin: 0 auto; +} + +.content { + padding: 20px; + height: 280px; + width: 750px; + text-align: left; + vertical-align: top; +} + +.current a, .current a:link, .current a:active, .current a:visited { + background: #fff url(images/menuo.png); + background-repeat: repeat-x; + color: #fff; +} + +.description { + vertical-align: top; + text-align: left; + width: 240px; + padding: 0px 0px 0px 3px; +} + +.graphic { + width: 50px; + height: 50px; + border: 4px solid #FDFDFD; + padding-left: 3px; +} + +.graphic img { + vertical-align: middle; + background-color: #FFFFFF; + padding: 3px 12px 3px 3px; + margin-right: 12px; + border-right: 3px solid silver; +} + +.hide { + display: none; +} + +.menu { + margin: 0; + padding: 0; + padding-top: 8px; + padding-bottom: 10px; + padding-left: 8px; + background: #000 url(images/menu.png); + background-repeat: repeat-x; +} + +.menu li { + list-style-type: none; + display: inline; + padding-right: 1px; +} + +.menu a, .menu a:link, .menu a:active, .menu a:visited { + border-bottom: 0; + padding: 7px 11px 9px 11px; + color: #fff; +} + +.menu a:hover { + text-decoration: none; + color: #fff; + background: #fff url(images/menuo.png); + background-repeat: repeat-x; +} + +.note { + color: #666666; + font-size: 10px; +} + +.pages_list .icon_col td img { + display: block; + border-style: none; + float: left; + padding-right: 7px; +} + +.pages_list table { + width: 100%; + margin: 0 auto; + background-color: #DCDCDC; +} + +.pages_list table td { + padding: 3px; +} + +.pages_list ul {margin:0;font-weight:normal; padding: 0px;} +.pages_list ul li {list-style-type:none;margin:2px 0; padding:0px;} + +.page_list { + display: none; +} + +.page_list_show li { + display: block; +} + +img.page_list_rights { + border: none; + margin-right: 5px; + float: left; + margin-top: 2px; + margin-bottom: 2px; +} + +.content input { + font-size: 12px; +} +.row_a { + background-color: #ECF3F7; +} + +.row_b { + background-color: #DBEBF2; +} + +.save, .reset { + width: 100px; +} + +.section { + margin-top: 10px; + padding: 0px; + /*border: 1px solid #999999;*/ + height: 75px; + width: 100%; + background-color: #FDFDFD; +} + +.sections_header { + width: 100%; + height: 50px; + margin-bottom: 10px; + background-color: #F0F0F0; + border: none; +} + +.sections_header td { + padding: 5px; +} + +.settings_table td { + vertical-align: top; + text-align: left; +} + +.setting_name { + width: 20%; +} + +.setting_value { + width: 80%; +} + +.setting_value input, .setting_value select, .setting_value textarea { + width: 100%; +} + +.setting_value textarea { + height: 50px; +} + +.title { + width: 90%; + text-align: left; + font-weight: bold; + font-size: 14px; + color: #003366; + height: 16px; + padding: 4px 0px 0px 3px; +} + +.tool_table td { + vertical-align: top; + text-align: left; +} + +.tool_table ul { + margin: 0; + padding: 0; + margin-left: 20px; + margin-bottom: 10px; +} + +.tool_table li { + padding-bottom: 5px; + list-style-type: disc; +} + +.value_input input, .value_input text, .value_input select { + width: 100%; +} + +#file_mode input { + width: 12px; + height: 12px; +} + +#dir_mode input { + width: 12px; + height: 12px; +} + +#hide2 { + display: none; +} + +/* CSS STYLES FOR THE PAGES SECTION */ + +table.pages_view { + width: 100%; + margin: 0 auto; + border: 0; + border-spacing: 0px; + background-color: #ECF3F7; +} + +table.pages_view td { + padding: 3px; +} + +table.pages_view tr:hover { + background-color: #F1F8DD; +} + +/* FORMS */ + +.submit, .cancel { + width: 100px; + margin-top: 5px; +} + +.form_submit { + width: 100%; +} + +.form_submit .left { + text-align: left; +} + +.form_submit .right { + text-align: right; +} + +.input_small { + width: 20px; +} + +.input_narrow { + width: 100px; +} + +.input_normal { + width: 120px; +} + +.input_medium { + width: 150px; +} + +.input_wide { + width: 200px; +} + +.input_large { + width: 300px; +} + +.input_full { + width: 100%; +} + +select option.disabled { + color: #aaa; +} + +.jsadmin_drag img { + padding: 3px 0; + margin-top: 1px; + vertical-align: top; + cursor: pointer; +} + +.modify_link { + vertical-align: middle; + padding-top: 4px; + display: inline; +} + +.header_title { + width: 100%; +} +.header_list_menu_title {text-align:left;} +.header_list_page_title {width:300px; text-align:left;} +.header_list_page_id {width:50px; text-align: right; padding-right:15px;} +.header_list_actions {width:150px; text-align:left;} + +.list_menu_title {text-align:left;} +.list_page_title {width:300px;text-align:left; } + +.list_page_id {width:30px;text-align: right; } +.list_actions {width:20px;text-align:left;} + +.sections_list {font-weight:bold;padding-left:10px;} +.sections_list table {width:900px;} + +.header_list_type {text-align:left;} +.header_list_block {text-align:left;width:180px;} +.header_list_pubdate_start {text-align:left;width:200px;} +.header_list_pubdate_end {text-align:left;width:200px;} +.header_list_sections_actions {text-align:left;width:30px;} +.header_list_section_id {width:30px;text-align:right;} + +.list_section_id {width:30px;text-align:right;} +.list_pubdate_start {text-align:left;width:200px;} +.list_pubdate_end {text-align:left;width:200px;} + +.value_page_code {color: #006400; font-weight: 400; width: 240px; } +.list_page_code { width: 240px; } +.list_page_language { width: 240px; } +#multi_lingual { font-weight: bolder; } /* Ende */ \ No newline at end of file Index: branches/2.8.x/wb/templates/wb_theme/templates/pages_settings.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/pages_settings.htt (revision 1224) +++ branches/2.8.x/wb/templates/wb_theme/templates/pages_settings.htt (revision 1225) @@ -134,7 +134,7 @@ {TEXT_LANGUAGE}: - + + + Index: branches/2.8.x/wb/templates/argos_theme/theme.css =================================================================== --- branches/2.8.x/wb/templates/argos_theme/theme.css (revision 1224) +++ branches/2.8.x/wb/templates/argos_theme/theme.css (revision 1225) @@ -130,3 +130,7 @@ .list_page_id {width:50px;text-align: right; padding-right:15px;} .list_actions {width:25px;text-align:left;} +.value_page_code {color: #006400; font-weight: 400; width: 240px; } +.list_page_code { width: 240px; } +.list_page_language { width: 240px; } +#multi_lingual { font-weight: bolder; } Index: branches/2.8.x/wb/templates/argos_theme/templates/pages_settings.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/pages_settings.htt (revision 1224) +++ branches/2.8.x/wb/templates/argos_theme/templates/pages_settings.htt (revision 1225) @@ -143,10 +143,10 @@ {TEXT_PAGE_CODE}: - - - +