Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1866) +++ branches/2.8.x/CHANGELOG (revision 1867) @@ -11,6 +11,16 @@ ! = Update/Change =============================================================================== + +19 Feb-2013 Build 1867 Dietmar Woellbrink (Luisehahne) +! fixed pagetree header +19 Feb-2013 Build 1866 Dietmar Woellbrink (Luisehahne) +# typofix in class TranslateTable +! framework/functions.php set function create_access_file to deprecated +! set ModLanguage.php to deprecated +! add methode escapeString to class WbDatabase +! update upgrade-script.php +! add getter property LastInsertId to class WbDatabase 19 Feb-2013 Build 1865 Werner v.d.Decken(DarkViper) ! update initialize.php for changed Twig-dir and activated cache in Translate ! initialize can handle now the new setup.ini format also. Index: branches/2.8.x/wb/admin/pages/PageTree.php =================================================================== --- branches/2.8.x/wb/admin/pages/PageTree.php (revision 1866) +++ branches/2.8.x/wb/admin/pages/PageTree.php (revision 1867) @@ -138,11 +138,12 @@ . $this->_Tabs(1).''.PHP_EOL . $this->_Tabs(1).''.PHP_EOL . $this->_Tabs(1).''.PHP_EOL - . $this->_Tabs(1).''.PHP_EOL + . $this->_Tabs(1).''.PHP_EOL - . $this->_Tabs(0).''.PHP_EOL - . $this->_Tabs(0).''.PHP_EOL + . $this->_Tabs(0).''.PHP_EOL . $this->_Tabs(0).''.PHP_EOL . $this->_Tabs(0).''.PHP_EOL Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1866) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1867) @@ -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', '1866'); +if(!defined('REVISION')) define('REVISION', '1867'); 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 1866) +++ branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1867) @@ -204,20 +204,20 @@ a:visited { color :#0066cc; } a:hover { color :#6699ff; text-decoration :underline; } /* */ -.header_list_actions { text-align :left; width :150px; } +.header_list_actions { text-align :left; padding :3px; width :180px; } .header_list_block { text-align :left; width :120px; } -.header_list_page_id { padding-right :15px; text-align :right; width :30px; } -.header_list_page_title, -.list_page_title { width :350px; } +.header_list_page_id { padding :3px; text-align :right; width :30px; } +.header_list_menu_title { padding : 3px; } +.header_list_page_title { width :350px; } /**/ .list_page_title, .list_menu_title, -.header_list_menu_title, .header_list_type { text-align :left; vertical-align :middle; } +.header_list_menu_title, .header_list_type { text-align :left; vertical-align :middle; padding : 3px; } .header_list_pubdate_start, .header_list_pubdate_end, .list_pubdate_start, .list_pubdate_end { text-align :left; white-space :nowrap; width :185px; } .header_list_sections_actions { text-align :left; width :30px; } -.header_list_type { font-size :1em; padding :4px 0; text-align :left; width :40%; } +.header_list_type { font-size :1em; padding :4px 0; text-align :left; width :34%; } .jsadmin_drag img { cursor :pointer; margin-top :0px; padding :0px 0; vertical-align :baseline; } .list_actions { height :20px; padding :0 1px; text-align :left; width :20px; } .list_page_code, @@ -226,7 +226,7 @@ .list_pubdate_end input[type="text"] { width :120px; } .list_section_id, .list_page_id, -.header_list_section_id { padding :0 3px; text-align :right; vertical-align :baseline; width :2em; } +.header_list_section_id { padding :0 3px; text-align :right; vertical-align :middle; width :2em; } .modify_link { display :inline; padding :0 2px; vertical-align :baseline; } .page_list { display :none; } img.page_list_rights { border :none; float :left; margin :0 auto; padding :0 2px; } @@ -234,6 +234,7 @@ .pages_list .icon_col td img { border-style :none; display :inline; float :left; padding-right :7px; } .pages_list { } +.list_page_title { width :350px; } .icon_col td img { border-style :none; display :inline; float :left; padding-right :7px; } .pages_list table { background-color :#dcdcdc; font-size :1.3em; margin :0 auto; table-layout :fixed; width :100%; } .pages_list ul { font-weight :normal; margin :0; padding :0px; } @@ -246,7 +247,6 @@ .sections_list, .pages_list_header { font-weight :bold; line-height :1.5em; margin-bottom :5px; text-align :left; } .pages_list_header { padding :2px 0px 2px 5px; font-size :1.3em; height :25px; } -.header_list_menu_title { padding-left :30px; width :400px; } .value_page_code { color :#006400; font-weight :400; width :240px; } .section-info { margin :1em auto; } /* depending styles for /admin/pages_settings */ @@ -259,9 +259,9 @@ div.page-settings select { } div.page-settings textarea { height :5em; } div.page-settings [type=checkbox] { width :2.5em; } - div.page-settings [type=reset], + div.page-settings [type=reset], div.page-settings [type=submit] { padding :2px; width :auto; } -div.page-settings-leftcol { float :left; padding :10px 10px 10px 10px; border-right :groove 0px #a8bccb; border 0 solid 1px #a8bccb :; } +div.page-settings-leftcol { float :left; padding :10px 10px 10px 10px; border-right :groove 0px #a8bccb; border: 0 solid 1px #a8bccb :; } div.page-settings-leftcol div.page-settings-tab { border :solid 1px #a8bccb; padding :8px; margin-bottom :8px; } div.page-settings-leftcol div { padding :2px 0 3px 0; vertical-align :top; } div.page-settings-leftcol label { width :170px; vertical-align :top; } Index: branches/2.8.x/wb/templates/argos_theme/css/screen.css =================================================================== --- branches/2.8.x/wb/templates/argos_theme/css/screen.css (revision 1866) +++ branches/2.8.x/wb/templates/argos_theme/css/screen.css (revision 1867) @@ -236,7 +236,7 @@ a:visited { color :#0066cc; } a:hover { color :#6699ff; text-decoration :underline; } /**/ -.header_list_actions { text-align :left; width :150px; } +.header_list_actions { text-align :left; width :190px; } .header_list_block { text-align :left; width :120px; } .header_list_page_id { padding-right :15px; text-align :right; width :30px; } .header_list_page_title, Index: branches/2.8.x/wb/modules/admin.php =================================================================== --- branches/2.8.x/wb/modules/admin.php (revision 1866) +++ branches/2.8.x/wb/modules/admin.php (revision 1867) @@ -215,7 +215,7 @@ //print '
' . $TEXT['BLOCK'] . ': ' . $block_name; print '
' . $TEXT['BLOCK'] . ': ' . $block_name; print ' Modul: ' . $section['module']." "; - print ' ID:
\n"; + print ' ID: ' . $section_id."
\n"; } } //
'.$this->_TEXT['VISIBILITY']. + . $this->_Tabs(1).''.PHP_EOL.''.$this->_TEXT['VISIBILITY']. ' / '.$this->_TEXT['MENU_TITLE'].':'.$this->_TEXT['PAGE_TITLE']. + . $this->_Tabs(0).''.$this->_TEXT['PAGE_TITLE']. 'PIDPID'.$this->_TEXT['ACTIONS']. ':