This script upgrades an existing WebsiteBaker installation to the .
The upgrade script alters the existing WB database to reflect the changes introduced with WB 2.8.x

- Memory Limit: {FILESIZE} | - Used Memory: {MEMORY} | +

+ Memory Limit: {FILESIZE} | + Used Memory: {MEMORY} | SQL-Queries executed: {QUERIES} | - Included {INCLUDES} files | {TXT_SUM_FILESIZE}{SUM_FILESIZE} + Summary size of {INCLUDES} included files: {SUM_FILESIZE}

@@ -30,6 +30,7 @@

{BACKEND_BODY_MODULE_JS} Index: branches/2.8.x/wb/admin/skel/themes/htt/success.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/success.htt (revision 1676) +++ branches/2.8.x/wb/admin/skel/themes/htt/success.htt (revision 1677) @@ -1,5 +1,5 @@ -

{MESSAGE}

- +

+ +

- - -

${TITLE_START}$ ${WB_URL}$ ${TITLE_HELP}$ @@ -53,11 +55,13 @@ Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1676) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1677) @@ -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', '1676'); +if(!defined('REVISION')) define('REVISION', '1677'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/templates/wb_theme/normalize.css =================================================================== --- branches/2.8.x/wb/templates/wb_theme/normalize.css (nonexistent) +++ branches/2.8.x/wb/templates/wb_theme/normalize.css (revision 1677) @@ -0,0 +1,431 @@ +/*! normalize.css 2011-09-22T17:42 UTC - http://github.com/necolas/normalize.css */ + +/* ============================================================================= + HTML5 display definitions + ========================================================================== */ + +/* + * Corrects block display not defined in IE6/7/8/9 & FF3 + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { + display: block; +} + +/* + * Corrects inline-block display not defined in IE6/7/8/9 & FF3 + */ + +audio, +canvas, +video { + display: inline-block; + *display: inline; + *zoom: 1; +} + +/* + * Prevents modern browsers from displaying 'audio' without controls + */ + +audio:not([controls]) { + display: none; +} + +/* + * Addresses styling for 'hidden' attribute not present in IE7/8/9, FF3, S4 + * Known issue: no IE6 support + */ + +[hidden] { + display: none; +} + + +/* ============================================================================= + Base + ========================================================================== */ + +/* + * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units + * http://clagnut.com/blog/348/#c790 + * 2. Keeps page centred in all browsers regardless of content height + * 3. Prevents iOS text size adjust after orientation change, without disabling user zoom + * www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ + */ + +html { + font-size: 100%; /* 1 */ + overflow-y: scroll; /* 2 */ + -webkit-text-size-adjust: 100%; /* 3 */ + -ms-text-size-adjust: 100%; /* 3 */ +} + +/* + * Addresses margins handled incorrectly in IE6/7 + */ + +body { + margin: 0; +} + +/* + * Addresses font-family inconsistency between 'textarea' and other form elements. + */ + +body, +button, +input, +select, +textarea { + font-family: sans-serif; +} + + +/* ============================================================================= + Links + ========================================================================== */ + +a { + color: #00e; +} + +a:visited { + color: #551a8b; +} + +/* + * Addresses outline displayed oddly in Chrome + */ + +a:focus { + outline: thin dotted; +} + +/* + * Improves readability when focused and also mouse hovered in all browsers + * people.opera.com/patrickl/experiments/keyboard/test + */ + +a:hover, +a:active { + outline: 0; +} + + +/* ============================================================================= + Typography + ========================================================================== */ + +/* + * Addresses styling not present in IE7/8/9, S5, Chrome + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/* + * Addresses style set to 'bolder' in FF3/4, S4/5, Chrome +*/ + +b, +strong { + font-weight: bold; +} + +blockquote { + margin: 1em 40px; +} + +/* + * Addresses styling not present in S5, Chrome + */ + +dfn { + font-style: italic; +} + +/* + * Addresses styling not present in IE6/7/8/9 + */ + +mark { + background: #ff0; + color: #000; +} + +/* + * Corrects font family set oddly in IE6, S4/5, Chrome + * en.wikipedia.org/wiki/User:Davidgothberg/Test59 + */ + +pre, +code, +kbd, +samp { + font-family: monospace, serif; + _font-family: 'courier new', monospace; + font-size: 1em; +} + +/* + * Improves readability of pre-formatted text in all browsers + */ + +pre { + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; +} + +/* + * 1. Addresses CSS quotes not supported in IE6/7 + * 2. Addresses quote property not supported in S4 + */ + +/* 1 */ + +q { + quotes: none; +} + +/* 2 */ + +q:before, +q:after { + content: ''; + content: none; +} + +small { + font-size: 75%; +} + +/* + * Prevents sub and sup affecting line-height in all browsers + * gist.github.com/413930 + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + + +/* ============================================================================= + Lists + ========================================================================== */ + +ul, +ol { + margin: 1em 0; + padding: 0 0 0 40px; +} + +dd { + margin: 0 0 0 40px; +} + +nav ul, +nav ol { + list-style: none; + list-style-image: none; +} + + +/* ============================================================================= + Embedded content + ========================================================================== */ + +/* + * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3 + * 2. Improves image quality when scaled in IE7 + * code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/ + */ + +img { + border: 0; /* 1 */ + -ms-interpolation-mode: bicubic; /* 2 */ +} + +/* + * Corrects overflow displayed oddly in IE9 + */ + +svg:not(:root) { + overflow: hidden; +} + + +/* ============================================================================= + Figures + ========================================================================== */ + +/* + * Addresses margin not present in IE6/7/8/9, S5, O11 + */ + +figure { + margin: 0; +} + + +/* ============================================================================= + Forms + ========================================================================== */ + +/* + * Corrects margin displayed oddly in IE6/7 + */ + +form { + margin: 0; +} + +/* + * Define consistent border, margin, and padding + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/* + * 1. Corrects color not being inherited in IE6/7/8/9 + * 2. Corrects alignment displayed oddly in IE6/7 + */ + +legend { + border: 0; /* 1 */ + *margin-left: -7px; /* 2 */ +} + +/* + * 1. Corrects font size not being inherited in all browsers + * 2. Addresses margins set differently in IE6/7, FF3/4, S5, Chrome + * 3. Improves appearance and consistency in all browsers + */ + +button, +input, +select, +textarea { + font-size: 100%; /* 1 */ + margin: 0; /* 2 */ + vertical-align: baseline; /* 3 */ + *vertical-align: middle; /* 3 */ +} + +/* + * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet + */ + +button, +input { + line-height: normal; /* 1 */ +} + +/* + * 1. Improves usability and consistency of cursor style between image-type 'input' and others + * 2. Corrects inability to style clickable 'input' types in iOS + * 3. Corrects inner spacing displayed oddly in IE7 without effecting normal text inputs + * Known issue: inner spacing remains in IE6 + */ + +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; /* 1 */ + -webkit-appearance: button; /* 2 */ + *overflow: visible; /* 3 */ +} + +/* + * 1. Addresses box sizing set to content-box in IE8/9 + * 2. Addresses excess padding in IE8/9 + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/* + * 1. Addresses appearance set to searchfield in S5, Chrome + * 2. Addresses box sizing set to border-box in S5, Chrome (include -moz to future-proof) + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/* + * Corrects inner padding displayed oddly in S5, Chrome on OSX + */ + +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/* + * Corrects inner padding and border displayed oddly in FF3/4 + * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/ + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/* + * 1. Removes default vertical scrollbar in IE6/7/8/9 + * 2. Improves readability and alignment in all browsers + */ + +textarea { + overflow: auto; /* 1 */ + vertical-align: top; /* 2 */ +} + + +/* ============================================================================= + Tables + ========================================================================== */ + +/* + * Remove most spacing between table cells + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} Property changes on: branches/2.8.x/wb/templates/wb_theme/normalize.css ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/templates/wb_theme/theme.css =================================================================== --- branches/2.8.x/wb/templates/wb_theme/theme.css (revision 1676) +++ branches/2.8.x/wb/templates/wb_theme/theme.css (revision 1677) @@ -160,17 +160,316 @@ button.status { cursor :pointer; border-radius :5px; -khtml-border-radius :5px; -webkit-border-radius :5px; -moz-border-radius :5px; } /* depending styles for /admin/pages_settings */ -div.page-settings { font-size: 0.9em; } - div.page-settings label { display: inline-block; } +div.page-settings { + font-size: 0.9em; + border: none; +} + div.page-settings div.caption { + font-size: 1em; + font-weight: bold; + padding: 3px 0 0px 0; + margin: 0; padding: 0; border: none; + margin-bottom: 10px; + border-bottom: groove 2px #a8bccb; + } + div.page-settings label { + display: inline-block; + } div.page-settings input, div.page-settings textarea, - div.page-settings select { width: 210px; } - div.page-settings textarea { height: 5em; } - div.page-settings [type=checkbox] { width: 2.5em; } -div.page-settings-leftcol { float: left; padding: 0.4em 1em; } - div.page-settings-leftcol div { padding: 2px 0 3px 0; vertical-align: top; } - div.page-settings-leftcol label { width: 170px; vertical-align: top; } -div.page-settings-centercol { float: left; padding: 0.4em 1em; - border-left: groove 2px #a8bccb; border-bottom: groove 2px #a8bccb; } -div.page-settings-rightcol { float: left; padding: 0.4em 1em; - border-left: groove 2px #a8bccb; border-bottom: groove 2px #a8bccb; } + div.page-settings select { + width: 210px; + } + div.page-settings select { +/* font-size: 1em; */ + } + div.page-settings textarea { + height: 5em; + } + div.page-settings [type=checkbox] { + width: 2.5em; + } +div.page-settings-leftcol { + float: left; + padding: 10px 10px 10px 10px; + border-right: groove 2px #a8bccb; +} + div.page-settings-leftcol div { + padding: 2px 0 3px 0; + vertical-align: top; + } + div.page-settings-leftcol label { + width: 170px; + vertical-align: top; + } +div.page-settings-righttoprow { + margin-left:417px; + padding: 5px 20px 5px 10px; +} + div.page-settings-righttoprow label { + width: 110px; + vertical-align: top; + } +div.page-settings-centercol { + float: left; + padding: 10px 20px 10px 20px; + border-right: groove 2px #a8bccb; +} +div.page-settings-rightcol { + float: left; + padding: 10px 20px 10px 10px; + border: none; +} +/* ************************************************************************** */ +/* DIV-mbox to show selector or simply content only ************************* */ +div.mbox { + padding :10px; + margin :15px auto; + background-color :#fff; + color :#330033; + font-size :1em; + display :block; +} + div.mbox div { } /* inner div to expand for additional decorations (see .mbox-icon div) */ + div.mbox div a { font-size :1em; color: #0052A1; } + div.mbox div a:hover { color: #0099FF; } + div.mbox div p.title { margin :0; padding :0.08em 0 0.6em 0; font-size: 110%; color: #0052A1; font-weight: bold;} + 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-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 ******************************** */ +div.box-ok { border-color: green; color: green; } +div.box-error { border-color: red; color: red; } +div.box-info { border-color: #bb7a00; color: #003ff2;} +div.box-warning { border-color: orange; color: orange;} +/* Border attributes for mbox and other elements also *********************** */ + +/* label/input attributes for mbox for tableless design *********************** */ +div.mbox label, +div.mbox select, +div.mbox span, +div.mbox textarea, +div.mbox input { display :block; float :left; margin-bottom :10px; margin-right :5px; } +div.mbox label { padding-right :10px; } +div.mbox label.radio { text-align : left; padding-right :20px; width :100px; } +div.mbox br { clear : both; } +/**/ +/* END of mbox - definition ************************************************* */ +/* ************************************************************************** */ +div.content_box form { width : 100%; } +.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 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; } + .content_box h5.title a:hover { color : #0099ff; } + .content_box h5.noscript { font-size :1.2em; padding :5px 0px 5px 0px; } + .content_box div.noscript { height :auto; width :100%; padding :5px; background :none no-repeat left; } +/* */ + button { padding :2px; } + button.link { padding :0px; background-color :transparent; display :inline; vertical-align :middle; border :0px none; cursor :pointer; } + button span.title { font-size :1.3em; display :inline; font-weight :100; color :#007ac8; letter-spacing :1px; } +/* */ +.curved { border : 1px solid #666666; } +div.col_content { margin-right :0.5em; padding :2px 0 2px 10px; } +.shadow { box-shadow :3px 3px 10px rgba(0, 0, 0, 0.6); } +.row_0 { background-color :transparent; } +.row_1 { background-color : #cccccc; } +/**/ +h1, h2, h3, h4, h5, h6 { color : #003366; display :block; font-weight :bold; margin :0.5em auto; padding-bottom :5px; } +h6 { font-size :100%; } +/**/ +.cleft, div.col_left { float :left; } +.cright, div.col_right { float :right; } +.c25, div.col_width25 { width :25%; } +.c33, div.col_width33 { width :33.333%; } +.c50, div.col_width50 { width :48%; } +.c60, div.col_width60 { width :60%; } +.c75, div.col_width75 { width :75%; } +.c90, div.col_width90 { width :90%; } +.c100, div.col_width100 { + width :100%; + margin : 0 auto; +} +.c400, .col_width400 { width :400px; } +.h30 { height :25px; } +.h50 { height :49px; } +.h65 { min-height :70px; overflow :hidden; } +.h80 { height :80px; } +.h100 { height :100px; } +.h120 { height :120px; } +.h140 { height :140px; } +.h185 { height :185px; } +.min_h100 { min-height :100px; } +.border { border-right :5px solid #cccccc; } +/**/ +.clear:after { clear :both; content :"."; display :block; font-size :0; height :0; visibility :hidden; } +.clear { clear :both; display :block; } +.ie-clearing { display :none; } +.floatbox { overflow :hidden; } +.spacer { line-height :1em; margin-right :0.5em; position :relative; } +table.layout { table-layout :fixed; } +/*overwriting above */ +td,th,textarea { color :#000000; font-size :96%; font-family :Verdana, Arial, Helvetica, sans-serif; } +textarea { font-size :86%; } +.container, .menu { + min-width :320px; + } +.content { + padding: 1em; + width: 85%; + min-width :320px; +} +div.dev-info { + background :#DDDDDD; + max-width: 85%; + min-height :2em; + height :auto; + white-space :normal; + margin : 0 auto 10px; + position :relative; + +} +.settings_table, .tool_table { + text-align :left; + vertical-align :top; +} + +input.save, +input.reset { +width:40%; + } +.msg-box { text-align :left; } + +.permission_box { + width :95%; + border :2px solid #ddd; + } +.permission_box caption { + text-align : center; + line-height : 30px; + font-weight :bold; + } +.permission_box th { + text-align :left; + background :#d2e8e8; + } +.permission_box th { + text-align :left; + } +.permission_box td label { + text-align :left; + vertical-align : text-top; + font-size :98%; + } +textarea { font-size :100%; } + +.setting_value label { + text-align :left; + vertical-align : text-top; + font-size :98%; + } +.menu { + margin :0; + padding :0; + padding-top :8px; + padding-bottom :10px; + padding-left :8px; + background : #000000 url(images/menu.png); +} +.menu li { padding-right :1px; list-style-type :none; display :inline; } +.menu a, .menu a:link, .menu a:active, .menu a:visited { + border-bottom :0; + padding :10px 11px; + color :#ffffff; +} + +/* header horizontal navigation */ +div.menu { + background : #486991 url(images/menu.png); + hei/ght : 3em; + line-height : 3.0em; + margin : 2px auto; + padding :0; + font-size :96%; + text-align :left; + width :100%; +} + div.menu ul { + color :#ffffff; + display :block; + padding :0; + list-style-position :outside; +} + div.menu * a { color :#ffffff; text-decoration :none; } + div.menu ul li { + color :#ffffff; + display :inline; + padding :10px 0px; +} + div.menu ul li a { + color :#ffff33; + display :inline; + padding :15px 5px; + font-weight :normal; +} + div.menu ul li a.active { + color :#ffffff; + padding :9px 11px 9px 11px; + background : #94dd00 url(images/menuo.png) no-repeat; +} + div.menu ul li:hover, + div.menu ul li a:hover { + color :#ffffff; + background : #486991 url(images/menuo.png) repeat-x; +} +.main { + width :auto; + min-/width :320px; + max-width :87em; + border :0px solid #000000; + margin : 0px auto; + padding :0px; + } + +.header { + width :85%; + } + .footer { + width :85%; + margin : 15px auto; + } +.logo { + width :278px; + padding-right :20px; + } +.version { + margin : 15px auto; + float :right; + } + .topnav { + margin : 0 auto; + text-align :center; + } + div.msg-box.center { + margin : 0 auto; + text-align :center; + } +.pages_list table td, table.pages_view td { + padding :3px; + font-size :150%; +} Index: branches/2.8.x/wb/templates/wb_theme/templates/header.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/header.htt (revision 1676) +++ branches/2.8.x/wb/templates/wb_theme/templates/header.htt (revision 1677) @@ -10,6 +10,7 @@ + {BACKEND_MODULE_CSS} -

+ +

- - -

${TITLE_START}$ ${WB_URL}$ ${TITLE_HELP}$ @@ -53,11 +55,13 @@ Index: branches/2.8.x/wb/templates/wb_theme/templates/footer.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/footer.htt (revision 1676) +++ branches/2.8.x/wb/templates/wb_theme/templates/footer.htt (revision 1677) @@ -3,7 +3,7 @@

- +

- Memory Limit: {FILESIZE} | - Used Memory: {MEMORY} | +

@@ -30,6 +30,7 @@

{BACKEND_BODY_MODULE_JS}

Missing required tables. You can install them in backend->addons->modules->advanced. Then again run upgrade-script.php

'; while ( list ( $key, $val ) = each ( $result ) ) { @@ -448,7 +450,7 @@ echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -if(version_compare(WB_REVISION, '1671', '<')) +if(version_compare(WB_REVISION, '1675', '<')) { echo '

Step '.(++$stepID).': Updating core tables

Upgrade /pages/ index.php access files

Missing required tables. You can install them in backend->addons->modules->advanced. Then again run upgrade-script.php

'; while ( list ( $key, $val ) = each ( $result ) ) { @@ -448,7 +450,7 @@ echo (db_update_key_value( 'settings', $cfg ) ? " $OK" : " $FAIL!"); -if(version_compare(WB_REVISION, '1671', '<')) +if(version_compare(WB_REVISION, '1675', '<')) { echo '

Step '.(++$stepID).': Updating core tables

Upgrade /pages/ index.php access files

'; while ( list ( $key, $val ) = each ( $result ) ) { @@ -448,7 +450,7 @@ echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -if(version_compare(WB_REVISION, '1671', '<')) +if(version_compare(WB_REVISION, '1675', '<')) { echo '