Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1765) +++ branches/2.8.x/CHANGELOG (revision 1766) @@ -13,6 +13,10 @@ +22 Sep-2012 Build 1766 Dietmar Woellbrink (Luisehahne) +! typofix in EN language, +! empty seo_title will set to menu_title +! continue rebranding wb_theme 22 Sep-2012 Build 1765 Dietmar Woellbrink (Luisehahne) ! recoded module news,form,wysiwyg upgrade to work with upgrade-script 22 Sep-2012 Build 1764 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/pages/settings.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings.php (revision 1765) +++ branches/2.8.x/wb/admin/pages/settings.php (revision 1766) @@ -279,7 +279,7 @@ // check already selected groups $bChecked = $admin->is_group_match($aGroup['ID'], $aCurrentPage['admin_groups']); // disable selected groups where current user is not member of - $bDisabled = !$admin->ami_group_member($aGroup['ID']); + $bDisabled = !$admin->ami_group_member('1'); $aGroup['CHECKED'] = $bChecked ? $sChecked : ''; $aGroup['DISABLED'] = ($bChecked && $bDisabled) ? $sDisabled : ''; } @@ -306,7 +306,7 @@ // check already selected groups $bChecked = $admin->is_group_match($aGroup['ID'], $aCurrentPage['viewing_groups']); // disable selected groups where current user is not member of - $bDisabled = !$admin->ami_group_member($aGroup['ID']); + $bDisabled = !$admin->ami_group_member('1'); $aGroup['CHECKED'] = $bChecked ? $sChecked : ''; $aGroup['DISABLED'] = ($bChecked && $bDisabled) ? $sDisabled : ''; } Index: branches/2.8.x/wb/admin/pages/settings_save.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings_save.php (revision 1765) +++ branches/2.8.x/wb/admin/pages/settings_save.php (revision 1766) @@ -100,7 +100,7 @@ } if($seo_title == '' || substr($seo_title,0,1)=='.') { - $admin->print_error($MESSAGE['PAGES_BLANK_SEO_TITLE'],$target_url); + $seo_title = $menu_title; } // Get existing perms @@ -287,6 +287,9 @@ // Create access file create_access_file($filename,$page_id,$level); + if(!file_exists($filename)) { + $admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']); + } // Move a directory for this page if(file_exists(WB_PATH.PAGES_DIRECTORY.$old_link.'/') && is_dir(WB_PATH.PAGES_DIRECTORY.$old_link.'/')) { @@ -318,7 +321,12 @@ { unlink($old_subpage_file); } - create_access_file(WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION, $sub['page_id'], $new_sub_level); + $sAccessFile = WB_PATH.PAGES_DIRECTORY.$new_sub_link.PAGE_EXTENSION; + create_access_file($sAccessFile, $sub['page_id'], $new_sub_level); + if(!file_exists($sAccessFile)) { + $admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']); + } + } } } Index: branches/2.8.x/wb/admin/pages/languages/EN.php =================================================================== --- branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1765) +++ branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1766) @@ -59,7 +59,7 @@ $TEXT['MENU_ICON_1_DIR'] = 'Folder Menu image hover'; $MESSAGE['PAGES_LAST_MODIFIED'] = 'Last modification by'; -$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Please enter a sro title'; +$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Please enter a Seo Title'; $HELP['PAGE_IMAGE_DIR'] = '

The topical side picture path is
{{icon_dir}}.

'; Index: branches/2.8.x/wb/admin/pages/add.php =================================================================== --- branches/2.8.x/wb/admin/pages/add.php (revision 1765) +++ branches/2.8.x/wb/admin/pages/add.php (revision 1766) @@ -222,6 +222,10 @@ // Create a new file in the /pages dir create_access_file($filename, $page_id, $level); +if(!file_exists($filename)) { + $admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']); +} + // add position 1 to new page $position = 1; Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1765) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1766) @@ -51,5 +51,5 @@ // 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.3'); -if(!defined('REVISION')) define('REVISION', '1765'); +if(!defined('REVISION')) define('REVISION', '1766'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/templates/wb_theme/css/screen.css =================================================================== --- branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1765) +++ branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1766) @@ -50,7 +50,14 @@ .spacer { line-height :1em; margin-right :0.5em; position :relative; } /* ************************************************************************** */ /* DIV-mbox to show selector or simply content only ************************* */ -div.mbox { padding :10px; margin :15px auto; background-color :#ffffff; color :#330033; font-size :1em; display :block; } +div.mbox { + padding : 5px 10px; + margin : 5px auto; + background-color :#ffffff; + color :#330033; + font-size :1em; + display :block; +} div.mbox div { } div.mbox div a { font-size :1em; color :#0052a1; } div.mbox div a:hover { color :#0099ff; } @@ -58,8 +65,18 @@ div.mbox div p { margin :0; padding :0 0 0.6em 0; } div.mbox:hover { } /* extension for mbox to show additional icons on left side ***************** */ -div.mbox-icon { background-repeat :no-repeat; background-image :url(icons/info_50.png); background-position :15px 50%; padding :15px; min-height :25px; } - div.mbox-icon div { margin-left :70px; border-left :0px outset; padding-left :5px; } +div.mbox-icon { + background-repeat :no-repeat; + background-image :url(icons/info_50.png); + background-position :15px 50%; + padding : 10px 5px; + min-height :25px; +} + div.mbox-icon div { + margin-left :70px; + border-left :0px outset; + padding-left :5px; +} div.mbox-icon16 { background-repeat :no-repeat; background-image :url(icons/info_16.png); background-position :5px 50%; padding :5px; min-height :10px; } div.mbox-icon16 div { margin-left :30px; border-left :4px outset; padding-left :5px; } /* coloring of the mbox and other boxes also ******************************** */ @@ -146,9 +163,14 @@ div.content_box form { } div.sub-row { background-color :#eeeeee; margin : 1px auto; overflow :hidden; padding :0; } div.col_content { margin-right :0.5em; padding :2px 0; } -.content_box { position :relative; margin :0px auto; padding :0; overflow :visible; } +.content_box { position :relative; margin :0px auto; padding :0; } .content_box form { background :transparent; height :auto; } - .content_box li { float :left; margin :auto 0.8em; list-style-type :none; display :block; } + .content_box li { + float :left; + padding :0 10px; + list-style-type :none; + display :block; +} .content_box ul { padding :0 0 0 15px; margin :0 auto; width :100%; } .content_box h5.title { color :#339bff; font-weight :bold; font-size :1.2em; margin :0 auto; text-align :left; } .content_box h5.title a:link { color :#0067ca; } @@ -267,7 +289,6 @@ div.page-settings p.page_group { } /* */ .header_title, .setting_value input, .setting_value select, .setting_value textarea, .value_input input, .value_input text, .value_input select, .form_submit, .input_full { width :80%; } -.content_box { text-align :left; } div.mbox span { white-space :nowrap; } div.mbox span label { padding-right :5px; } div.mbox span [type="checkbox"] { width :2.5em; }