Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1607) +++ branches/2.8.x/CHANGELOG (revision 1608) @@ -9,8 +9,12 @@ - = Removed # = Bugfix ! = Update/Change +=============================================================================== -=========================== add small Features 2.8.2 ========================== + +----------------------------------- 2.8.3 -------------------------------- +209 Feb-2012 Build 1608 Dietmar Woellbrink (Luisehahne) +! A small optical correction of the installer. 09 Feb-2012 Build 1607 Dietmar Woellbrink (Luisehahne) # typofix in /modules/form/view.php (Tks to jacobi22) 08 Feb-2012 Build 1606 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1607) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1608) @@ -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.2'); -if(!defined('REVISION')) define('REVISION', '1607'); +if(!defined('REVISION')) define('REVISION', '1608'); if(!defined('SP')) define('SP', 'SP2'); Index: branches/2.8.x/wb/install/stylesheet.css =================================================================== --- branches/2.8.x/wb/install/stylesheet.css (revision 1607) +++ branches/2.8.x/wb/install/stylesheet.css (revision 1608) @@ -1,16 +1,179 @@ -body,td,th,input,textarea { font-family :Verdana, Arial, Helvetica, sans-serif; font-size :12px; color :#000000; } -body { background-color :#a8bccb; background-image :url(../templates/wb_theme/images/background.png); background-repeat :repeat-x; margin :0px; } -form { margin :0; } -input:focus, select:focus { background :#f1f8fd; } -.wrong { background-color :#ffdbdb; } -.submit { border :solid 2px #cccccc; background :#ffeeee; color :#ee0000; font-weight :bold; font-size :11px; padding :4px; width :100%; } -.content { background-color :#ffffff; padding :15px; height :350px; width :850px; text-align :justify; vertical-align :top; } -hr { margin :1em auto; color :#003366; height :1px; } -h1 { font-size :130%; color :#336699; margin :0px 0px 5px 0px; border-bottom :1px solid #cccccc; } -a:link, a:visited, a:active { color :#003366; text-decoration :none; } -a:hover { text-decoration :none; color :#336699; } -.bad { color :#ff0000; font-weight :bold; } -.good { color :#009900; font-weight :bold; } -.note { color :#666666; font-size :10px; } -.hide { display :none; } -.warning { border :2px #884444 solid; padding :5px; margin :5px auto; background :#ffeeee; color :#ee0000; text-align :center; font-size :12px; font-weight :normal; line-height :16px; -webkit-border-radius :0.75em; -moz-border-radius :0.75em; border-radius :0.75em; } +@charset "UTF-8"; +/* thead { + background-color: #f2f1ff; + } + table > thead > tr { + } + table > thead > tr > th { + color: #555758; + font-size: 1.15em; + padding: 1.2em 1em; + } + table > thead > tr > td { + color: #555758; + font-size: 1.08em; + padding: 1.2em 1em; + } + table > tbody { + display: block; + } + table > tbody > tr { + border-bottom :1px solid #222222; /* #d2d1cc; */ + padding :0.8em 0 0.2em 0; + width :100%; +} + table > tbody > tr > th { + font-size: 1em; + width: 1%; + padding-left: 0.8em; padding-right: 0.8em; + vertical-align: top; + text-align: right; + white-space: nowrap; + } + table > tbody > tr > td { + font-size: 1em; + width: 19%; + padding-left: 0.8em; padding-right: 0.8em; + vertical-align: top; + text-align: left; + line-height :2em; + } + +td.step-row { + line-height : 3em; + color : #666666; + font-weight : bold; + font-size : 100%; +} +td.name { + width : 180px; + color: #666666; + vertical-align :middle; + font-weight : bold; + font-size : 90%; + float :left; + } +td.value { + width : 100%; + vertical-align :middle; + } +td.value input { + width : 100%; + vertical-align :middle; + } + + +h1.step-row { + margin : 0; + display :inline; + color : #6699ff; +} +/* + FORM Elements +*/ +form { margin: 0; } +input, select { padding: 2px; border: solid 1px #a3baca; } +input:focus, select:focus { background: #fdf8e8; } +input.submit { + color: #305c8d; + font-size: 12px; + font-weight: bold; + text-transform: uppercase; + letter-spacing: 1px; + padding: 6px; + margin: 1em 0; + cursor: pointer; + border: outset 2px green; +} +input.submit:hover { + border-style: inset; +} +input.submit.bad { + background-color: #fde8e8; + border-color: red; +} +input.submit.good { + background-color: #deffde; + border-color: green; +} +/* + COMMON Elements +*/ +img {border: none; } +p { margin: 11px 0 4px 0 } +h1 { color: #3a628f; font-size: 1.3em; margin: 10px 0 5px; border-top: medium none } +a, a:link, a:visited, a:active { color: #003366; text-decoration: underline } +a:focus {outline: none; } +a:hover { color: #336699 } +/* + HINTS +*/ + +.warning, .error { + color: #b70000; + line-height: 1.2em; + background-color: #fde8e8; + margin-top: 0.5em; + padding: 0.3em 0.5em; + border: solid 1px +} +.warning { + color: #ca6800; +} +.bad { color: #b70000; } +.good { color: #118301; } +.warn { color: #ca6800; } +.hint { color: #464646; font-size: 0.85em; } +.small { font-size: 0.85em; } +.italic { font-style: italic; } +.center { text-align: center; } +.hide { display: none; } +/* + List Elements +*/ +ul { margin: 0; padding: 2px 0 2px 15px; } +li { list-style-type: square; margin: 0; } +/* ************************************************************************** */ Index: branches/2.8.x/wb/install/background.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/2.8.x/wb/install/background.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: branches/2.8.x/wb/install/logo.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/2.8.x/wb/install/logo.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: branches/2.8.x/wb/install/index.php =================================================================== --- branches/2.8.x/wb/install/index.php (revision 1607) +++ branches/2.8.x/wb/install/index.php (revision 1608) @@ -83,7 +83,7 @@ if(type == 'linux') { document.getElementById('operating_system_linux').checked = true; document.getElementById('operating_system_windows').checked = false; - document.getElementById('file_perms_box').style.display = 'block'; + document.getElementById('file_perms_box').style.display = 'none'; } else if(type == 'windows') { document.getElementById('operating_system_linux').checked = false; document.getElementById('operating_system_windows').checked = true; @@ -93,13 +93,12 @@ - - - -
+
+ + + - @@ -112,31 +111,26 @@ -
Logo  

Installation Wizard
- - - -
- -
+
Welcome to the Website Baker Installation Wizard. -
- +
Error:
Error:
- +
- + Enabled') { ?> - + - - + - - - - + + - - + - + + @@ -190,14 +183,13 @@ But this solution does not guarranty a correct displaying of the content from all modules!

- - -

Step 1

Please check the following requirements are met before continuing...

Step 1

 Please check the following requirements are met before continuing...
Please note: PHP Session Support may appear disabled if your browser does not support cookies.Please note: PHP Session Support may appear disabled if your browser does not support cookies.
PHP Version > 5.2.1 + PHP Version > 5.2.1 ')) { @@ -147,23 +141,12 @@ } ?> PHP Session SupportPHP Safe Mode - DisabledEnabled - PHP Session Support
Server DefaultCharset + Server DefaultCharset  PHP Safe Mode + DisabledEnabled +
- - - - - + + +

Step 2

Please check the following files/folders are writeable before continuing...
+ + + +Writeable'; $config_content = " - - - - - - - - + + + + + + + + + + + @@ -268,15 +263,15 @@

Step 2

 Please check the following files/folders are writeable before continuing...
/pages/Writeable'; } elseif(!file_exists('../pages/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/media/Writeable'; } elseif(!file_exists('../media/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/templates/Writeable'; } elseif(!file_exists('../templates/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
/pages/Writeable'; } elseif(!file_exists('../pages/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/media/Writeable'; } elseif(!file_exists('../media/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>/templates/Writeable'; } elseif(!file_exists('../templates/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
/modules/ Writeable'; } elseif(!file_exists('../modules/')) {$installFlag = false; echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?> /languages/ 
- +
- + - - - -

Step 3

Please check your path settings, and select a default timezone and a default backend language...

Step 3

 Please check URL settings, and select a default timezone and a default backend language...
+ Absolute URL: +
+ Default Timezone: @@ -334,7 +329,7 @@
+ Default Language: @@ -356,149 +351,158 @@
- +
- + - - - + + +

Step 4

Please specify your operating system information below...

Step 4

 Please specify your operating system information below...
+   Server Operating System: - /> + + /> Linux/Unix based
/> Windows 		-
- /> -
  +
+ World-writeable file permissions (777) -
- (Please note: only recommended for testing environments) +
+

(Please note: only recommended for testing environments)
- +
- + - - + - - - - - + - - - - - + - - + + + + + + + + + + +
Please enter your MySQL database server details below...

Step 5

 Please enter your MySQL database server details below...
Host Name: - type="text" tabindex="7" name="database_host" style="width: 98%;" value="" /> + Host Name + type="text" tabindex="7" name="database_host" value="" />  Username: - type="text" tabindex="9" name="database_username" style="width: 98%;" value="" /> -
Database Name:
[a-zA-Z0-9_-]		 - type="text" tabindex="8" name="database_name" style="width: 98%;" value="" /> + Database Name ([a-zA-Z0-9_-]) + type="text" tabindex="8" name="database_name" value="" />  Password: - -
Table Prefix:
[a-zA-Z0-9_]		 - type="text" tabindex="11" name="table_prefix" style="width: 250px;" value="" /> + Table Prefix ([a-zA-Z0-9_]) + type="text" tabindex="11" name="table_prefix" value="" />   +
Username: + type="text" tabindex="9" name="database_username" value="" /> +
Password: + +
/>
- (Please note: May remove existing tables and data) + (Please note: May remove existing tables and data)
+ + - + - - + + +

Step 5

Please enter your website title below...

Step 6

 Please enter your website title below...
Website Title: - type="text" tabindex="13" name="website_title" style="width: 99%;" value="" /> + Website Title: + type="text" tabindex="13" name="website_title" value="" />
+ - + - - + - - - + + + - - + - - - - + + - - - +

Step 6

Please enter your Administrator account details below...

Step 7

Please enter your Administrator account details below...
Username: - type="text" tabindex="14" name="admin_username" style="width: 98%;" value="" /> + Loginname: + type="text" tabindex="14" name="admin_username" value="" />  Password: - type="password" tabindex="16" name="admin_password" style="width: 98%;" value="" /> +
Email: + type="text" tabindex="15" name="admin_email" value="" />
Email: - type="text" tabindex="15" name="admin_email" style="width: 98%;" value="" /> + Password: + type="password" tabindex="16" name="admin_password" value="" />  Re-Password: - type="password" tabindex="17" name="admin_repassword" style="width: 98%;" value="" /> -

 

Re-Password: + type="password" tabindex="17" name="admin_repassword" value="" /> +
- +
+ - + + + -
Please note:  Please note:  
+

Website Baker is released under the GNU General Public License
By clicking install, you are accepting the license. +

- 		+
+

- + - + +

-
- - - - -
+
Website Baker is released under the GNU General Public License -
+
+