Project

General

Profile

« Previous | Next » 

Revision 1608

Added by Dietmar over 12 years ago

A small optical correction of the installer.

View differences:

branches/2.8.x/CHANGELOG
9 9
- = Removed
10 10
# = Bugfix
11 11
! = Update/Change
12
===============================================================================
12 13

  
13
=========================== add small Features 2.8.2 ==========================
14

  
15
----------------------------------- 2.8.3 --------------------------------
16
209 Feb-2012 Build 1608 Dietmar Woellbrink (Luisehahne)
17
! A small optical correction of the installer.
14 18
09 Feb-2012 Build 1607 Dietmar Woellbrink (Luisehahne)
15 19
# typofix in /modules/form/view.php (Tks to jacobi22)
16 20
08 Feb-2012 Build 1606 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.2');
54
if(!defined('REVISION')) define('REVISION', '1607');
54
if(!defined('REVISION')) define('REVISION', '1608');
55 55
if(!defined('SP')) define('SP', 'SP2');
branches/2.8.x/wb/install/stylesheet.css
1
body,td,th,input,textarea { font-family :Verdana, Arial, Helvetica, sans-serif; font-size :12px; color :#000000; }
2
body { background-color :#a8bccb; background-image :url(../templates/wb_theme/images/background.png); background-repeat :repeat-x; margin :0px; }
3
form { margin :0; }
4
input:focus, select:focus { background :#f1f8fd; }
5
.wrong { background-color :#ffdbdb; }
6
.submit { border :solid 2px #cccccc; background :#ffeeee; color :#ee0000; font-weight :bold; font-size :11px; padding :4px; width :100%; }
7
.content { background-color :#ffffff; padding :15px; height :350px; width :850px; text-align :justify; vertical-align :top; }
8
hr { margin :1em auto; color :#003366; height :1px; }
9
h1 { font-size :130%; color :#336699; margin :0px 0px 5px 0px; border-bottom :1px solid #cccccc; }
10
a:link, a:visited, a:active { color :#003366; text-decoration :none; }
11
a:hover { text-decoration :none; color :#336699; }
12
.bad { color :#ff0000; font-weight :bold; }
13
.good { color :#009900; font-weight :bold; }
14
.note { color :#666666; font-size :10px; }
15
.hide { display :none; }
16
.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; }
1
@charset "UTF-8";
2
/* <![CDATA[ */
3
/*
4
*/
5
* { margin :0px auto; padding :0px; }
6
* html body * { overflow :visible; }
7

  
8
html {
9
	padding:0; 	margin:0; border:0;
10
	font-size:85%; font-family: Arial, Verdana, Helvetica, sans-serif;
11
	color: #202020;
12
   overflow :-moz-scrollbars-vertical; overflow-x :auto;
13
}
14
table {font-size: 1em;}
15
body {
16
	padding: 0; border:0; margin: 0;
17
	background: url('background.png') repeat-x 0px 0px;
18
	background-color: #a8bccb;
19
	height: 101%;
20
}
21

  
22
div.body {
23
	width: 790px;
24
	margin: 1em auto;
25
	padding: 20px 20px 5px 20px;
26
	background-color: #ffffff;
27
	border: solid 1px #305c8d
28
}
29
div.content {
30
	margin-top:20px;
31
}
32

  
33
/*
34
	TABLE Elements
35
*/
36
table {
37
	background-color: #f8f8ff;
38
	margin-top: 15px;
39
	margin-bottom: 5px;
40
	width: 100%;
41
	border-style: solid;
42
	border-width: 1px 2px 2px 1px;
43
	border-color: #a3baca;
44
}
45
	table > thead {
46
		background-color: #f2f1ff;
47
	}
48
		table > thead > tr {
49
		}
50
			table > thead > tr > th {
51
				color: #555758;
52
				font-size: 1.15em;
53
				padding: 1.2em 1em;
54
			}
55
			table > thead > tr > td {
56
				color: #555758;
57
				font-size: 1.08em;
58
				padding: 1.2em 1em;
59
			}
60
	table > tbody {
61
		display: block;
62
	}
63
		table > tbody > tr {
64
   border-bottom :1px solid #222222; /* #d2d1cc; */
65
   padding :0.8em 0 0.2em 0;
66
   width :100%;
67
}
68
			table > tbody > tr > th {
69
				font-size: 1em;
70
				width: 1%;
71
				padding-left: 0.8em; padding-right: 0.8em;
72
				vertical-align: top;
73
				text-align: right;
74
				white-space: nowrap;
75
			}
76
			table > tbody > tr > td {
77
				font-size: 1em;
78
				width: 19%;
79
				padding-left: 0.8em; padding-right: 0.8em;
80
				vertical-align: top;
81
				text-align: left;
82
            line-height :2em;
83
			}
84

  
85
td.step-row {
86
   line-height : 3em;
87
   color : #666666;
88
   font-weight : bold;
89
   font-size : 100%;
90
}
91
td.name { 
92
   width : 180px;
93
   color: #666666;
94
   vertical-align :middle;
95
   font-weight : bold;
96
   font-size : 90%;
97
   float :left;
98
 }
99
td.value { 
100
   width : 100%;
101
   vertical-align :middle;
102
 }
103
td.value input { 
104
   width : 100%;
105
   vertical-align :middle;
106
 }
107
 
108
 
109
h1.step-row {
110
   margin : 0;
111
   display :inline;
112
   color : #6699ff;
113
}
114
/*
115
	FORM Elements
116
*/
117
form { margin: 0; }
118
input, select { padding: 2px; border: solid 1px #a3baca; }
119
input:focus, select:focus { background: #fdf8e8; }
120
input.submit    {
121
	color: #305c8d;
122
	font-size: 12px;
123
	font-weight: bold;
124
	text-transform: uppercase;
125
	letter-spacing: 1px;
126
	padding: 6px;
127
	margin: 1em 0;
128
	cursor: pointer;
129
	border: outset 2px green;
130
}
131
input.submit:hover  {
132
	border-style: inset;
133
}
134
input.submit.bad {
135
	background-color: #fde8e8;
136
	border-color: red;
137
}
138
input.submit.good {
139
	background-color: #deffde;
140
	border-color: green;
141
}
142
/*
143
	COMMON Elements
144
*/
145
img {border: none; }
146
p  { margin: 11px 0 4px 0 }
147
h1 { color: #3a628f; font-size: 1.3em; margin: 10px 0 5px; border-top: medium none }
148
a, a:link, a:visited, a:active  { color: #003366; text-decoration: underline }
149
a:focus {outline: none; }
150
a:hover  { color: #336699 }
151
/*
152
	HINTS
153
*/
154

  
155
.warning, .error {
156
	color: #b70000;
157
	line-height: 1.2em;
158
	background-color: #fde8e8;
159
	margin-top: 0.5em;
160
	padding: 0.3em 0.5em;
161
	border: solid 1px
162
}
163
.warning {
164
	color: #ca6800;
165
}
166
.bad { color: #b70000; }
167
.good { color: #118301; }
168
.warn { color: #ca6800; }
169
.hint { color: #464646; font-size: 0.85em; }
170
.small { font-size: 0.85em; }
171
.italic { font-style: italic; }
172
.center { text-align: center; }
173
.hide { display: none; }
174
/*
175
	List Elements
176
*/
177
ul  { margin: 0; padding: 2px 0 2px 15px; }
178
li  { list-style-type: square; margin: 0; }
179
/* ************************************************************************** */
branches/2.8.x/wb/install/index.php
83 83
	if(type == 'linux') {
84 84
		document.getElementById('operating_system_linux').checked = true;
85 85
		document.getElementById('operating_system_windows').checked = false;
86
		document.getElementById('file_perms_box').style.display = 'block';
86
		document.getElementById('file_perms_box').style.display = 'none';
87 87
	} else if(type == 'windows') {
88 88
		document.getElementById('operating_system_linux').checked = false;
89 89
		document.getElementById('operating_system_windows').checked = true;
......
93 93
</script>
94 94
</head>
95 95
<body>
96

  
97
<table cellpadding="0" cellspacing="0" border="0" width="998px" align="center">
98
<tr>
99
	<td width="60" valign="top">
96
<div class="body">
97
<table summary="" cellpadding="0" cellspacing="0">
98
<tr style="background: #a9c9ea;">
99
	<td valign="top">
100 100
		<img src="../templates/wb_theme/images/logo.png" alt="Logo" />
101 101
	</td>
102
	<td width="5">&nbsp;</td>
103 102
	<td>
104 103
		<h1 style="border:none; margin-top:1em;font-size:150%;">Installation Wizard</h1>
105 104
	</td>
......
112 111
<input type="hidden" name="password_fieldname" value="admin_password" />
113 112
<input type="hidden" name="remember" id="remember" value="true" />
114 113

  
115
<table cellpadding="0" cellspacing="0" border="0" width="998px" align="center" style="margin-top: 10px;">
116
<tr>
117
	<td class="content">
118
	
119
		<center style="padding: 5px;">
114
		<div style="padding: 5px; text-align: center; font-weight: bold;">
120 115
			Welcome to the Website Baker Installation Wizard.
121
		</center>
122
		
116
		</div>
123 117
		<?php
124 118
		if(isset($_SESSION['message']) AND $_SESSION['message'] != '') {
125
			?><div style="width: 700px; padding: 10px; margin-bottom: 5px; border: 1px solid #FF0000; background-color: #FFDBDB;"><b>Error:</b> <?php echo $_SESSION['message']; ?></div><?php
119
			?><div  style="width: 700px; padding: 10px; margin-bottom: 5px; border: 1px solid #FF0000; background-color: #FFDBDB;"><b>Error:</b> <?php echo $_SESSION['message']; ?></div><?php
126 120
		}
127 121
		?>
128
		<table cellpadding="3" cellspacing="0" width="100%" align="center">
122
		<table summary="" cellpadding="0" cellspacing="0" border="0">
129 123
		<tr>
130
			<td colspan="6"><h1>Step 1</h1>Please check the following requirements are met before continuing...</td>
124
			<td colspan="6" class="step-row"><h1 class="step-row">Step 1</h1>&nbsp;Please check the following requirements are met before continuing...</td>
131 125
		</tr>
132 126
		<?php if($session_support != '<font class="good">Enabled</font>') { ?>
133 127
		<tr>
134
			<td colspan="6" style="font-size: 10px;" class="bad">Please note: PHP Session Support may appear disabled if your browser does not support cookies.</td>
128
			<td colspan="6" class="error">Please note: PHP Session Support may appear disabled if your browser does not support cookies.</td>
135 129
		</tr>
136 130
		<?php } ?>
137 131
		<tr>
138
			<td width="160" style="color: #666666;">PHP Version > 5.2.1</td>
139
			<td width="60">
132
			<td style="color: #666666;">PHP Version > 5.2.1</td>
133
			<td>
140 134
				<?php
141 135
			   if (version_compare(PHP_VERSION, '5.2.1', '>'))
142 136
			   {
......
147 141
				}
148 142
				?>
149 143
			</td>
150
			<td width="140" style="color: #666666;">PHP Session Support</td>
151
			<td width="105"><?php echo $session_support; ?></td>
152
			<td width="115" style="color: #666666;">PHP Safe Mode</td>
153
			<td>
154
				<?php
155
				if(ini_get('safe_mode')=='' || strpos(strtolower(ini_get('safe_mode')), 'off')!==FALSE || ini_get('safe_mode')==0) {
156
					?><font class="good">Disabled</font><?php
157
				} else {
158
					$installFlag = false;
159
					?><font class="bad">Enabled</font><?php
160
				}
161
				?>
162
			</td>
144
			<td style="color: #666666;">PHP Session Support</td>
145
			<td><?php echo $session_support; ?></td>
163 146
		</tr>
164 147
	<tr>
165
		<td width="160" style="color: #666666;">Server DefaultCharset</td>
166
			<td width="60">
148
		<td style="color: #666666;">Server DefaultCharset</td>
149
			<td>
167 150
				<?php
168 151
					$chrval = (($e_adc != '') && (strtolower($e_adc) != 'utf-8') ? true : false);
169 152
					if($chrval == false) {
......
177 160

  
178 161
				?>
179 162
			</td>
180
			<td colspan="4">&nbsp;</td>
163
			<td style="color: #666666;">PHP Safe Mode</td>
164
			<td>
165
				<?php
166
				if(ini_get('safe_mode')=='' || strpos(strtolower(ini_get('safe_mode')), 'off')!==FALSE || ini_get('safe_mode')==0) {
167
					?><font class="good">Disabled</font><?php
168
				} else {
169
					$installFlag = false;
170
					?><font class="bad">Enabled</font><?php
171
				}
172
				?>
173
			</td>
181 174
		</tr>
182 175
		<?php if($chrval == true) {
183 176
		?>
......
190 183
But this solution does not guarranty a correct displaying of the content from all modules!
191 184
</p>
192 185
</td>
193
		</tr>
194
		<?php } ?>
195
		</table>
196
		<table cellpadding="3" cellspacing="0" width="100%" align="center">
197
		<tr>
198
			<td colspan="8"><h1>Step 2</h1>Please check the following files/folders are writeable before continuing...</td>
199
		</tr>
200
		<tr>
186
</tr>
187
<?php } ?>
188
</table>
189
<table summary="" cellpadding="3" cellspacing="0">
190
<tr>
191
	<td colspan="8" class="step-row"><h1 class="step-row">Step 2</h1>&nbsp;Please check the following files/folders are writeable before continuing...</td>
192
</tr>
201 193
<?php
202 194
	$config = '<font class="good">Writeable</font>';
203 195
	$config_content = "<?php\n";
......
248 240
		}
249 241
	}
250 242
?>
251
			<td width="150px" style="color: #666666;"><?php print $wb_root.$configFile ?></td>
252
			<td width="150px"><?php echo $config ?></td>
253
			<td width="140px" style="color: #666666;"><?php print $wb_root ?>/pages/</td>
254
			<td width="120px"><?php if(is_writable('../pages/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../pages/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
255
			<td width="140px" style="color: #666666;"><?php print $wb_root ?>/media/</td>
256
			<td width="120px"><?php if(is_writable('../media/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../media/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
257
			<td width="140px" style="color: #666666;"><?php print $wb_root ?>/templates/</td>
258
			<td width="120px"><?php if(is_writable('../templates/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../templates/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
243
		<tr>
244
			<td style="color: #666666;"><?php print $wb_root.$configFile ?></td>
245
			<td colspan="2" ><?php echo $config ?></td>
259 246
		</tr>
260 247
		<tr>
248
			<td style="color: #666666;"><?php print $wb_root ?>/pages/</td>
249
			<td><?php if(is_writable('../pages/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../pages/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
250
			<td style="color: #666666;"><?php print $wb_root ?>/media/</td>
251
			<td><?php if(is_writable('../media/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../media/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
252
			<td style="color: #666666;"><?php print $wb_root ?>/templates/</td>
253
			<td><?php if(is_writable('../templates/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../templates/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
254
		</tr>
255
		<tr>
261 256
			<td style="color: #666666;"><?php print $wb_root ?>/modules/</td>
262 257
			<td><?php if(is_writable('../modules/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists('../modules/')) {$installFlag = false; echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
263 258
			<td style="color: #666666;"><?php print $wb_root ?>/languages/</td>
......
268 263
			<td>&nbsp;</td>
269 264
		</tr>
270 265
		</table>
271
		<table cellpadding="3" cellspacing="0" width="100%" align="center">
266
		<table summary="" cellpadding="3" cellspacing="0" >
272 267
		<tr>
273
			<td colspan="2"><h1>Step 3</h1>Please check your path settings, and select a default timezone and a default backend language...</td>
268
			<td colspan="2" class="step-row"><h1 class="step-row">Step 3</h1>&nbsp;Please check URL settings, and select a default timezone and a default backend language...</td>
274 269
		</tr>
275 270
		<tr>
276
			<td width="125" style="color: #666666;">
271
			<td class="name">
277 272
				Absolute URL:
278 273
			</td>
279
			<td>
274
			<td class="value">
280 275
				<?php
281 276
				// Try to guess installation URL
282 277
				$guessed_url = 'http://'.$_SERVER["SERVER_NAME"].$_SERVER["SCRIPT_NAME"];
......
286 281
			</td>
287 282
		</tr>
288 283
		<tr>
289
			<td style="color: #666666;">
284
			<td class="name">
290 285
				Default Timezone:
291 286
			</td>
292 287
			<td>
......
334 329
			</td>
335 330
		</tr>
336 331
		<tr>
337
			<td style="color: #666666;">
332
			<td class="name">
338 333
				Default Language:
339 334
			</td>
340 335
			<td>
......
356 351
			</td>
357 352
		</tr>
358 353
		</table>
359
		<table cellpadding="5" cellspacing="0" width="100%" align="center">
354
		<table border="0" summary="" cellpadding="0" cellspacing="0">
360 355
		<tr>
361
			<td colspan="3"><h1>Step 4</h1>Please specify your operating system information below...</td>
356
			<td class="step-row" colspan="3"><h1 class="step-row">Step 4</h1>&nbsp;Please specify your operating system information below...</td>
362 357
		</tr>
363 358
		<tr>
364
			<td width="170">
359
			<td class="name">&nbsp;
365 360
				Server Operating System:
366 361
			</td>
367
			<td width="180">
368
				<input type="radio" tabindex="4" name="operating_system" id="operating_system_linux" onclick="document.getElementById('file_perms_box').style.display = 'block';" value="linux"<?php if(!isset($_SESSION['operating_system']) OR $_SESSION['operating_system'] == 'linux') { echo ' checked="checked"'; } ?> />
362
			<td style="">
363
				<input type="radio" tabindex="4" name="operating_system" id="operating_system_linux" onclick="document.getElementById('file_perms_box').style.display = 'none';" value="linux"<?php if(!isset($_SESSION['operating_system']) OR $_SESSION['operating_system'] == 'linux') { echo ' checked="checked"'; } ?> />
369 364
				<span style="cursor: pointer;" onclick="javascript: change_os('linux');">Linux/Unix based</span>
370 365
				<br />
371 366
				<input type="radio" tabindex="5" name="operating_system" id="operating_system_windows" onclick="document.getElementById('file_perms_box').style.display = 'none';" value="windows"<?php if(isset($_SESSION['operating_system']) AND $_SESSION['operating_system'] == 'windows') { echo ' checked="checked"'; } ?> />
372 367
				<span style="cursor: pointer;" onclick="javascript: change_os('windows');">Windows</span>
373 368
			</td>
374
			<td>
375
				<div id="file_perms_box" style="margin: 0; padding: 0; display: <?php if(isset($_SESSION['operating_system']) AND $_SESSION['operating_system'] == 'windows') { echo 'none'; } else { echo 'block'; } ?>;">
376
					<input type="checkbox" tabindex="6" name="world_writeable" id="world_writeable" value="true"<?php if(isset($_SESSION['world_writeable']) AND $_SESSION['world_writeable'] == true) { echo 'checked'; } ?> />
377
					<label for="world_writeable">
369
		</tr>
370
		<tr>
371
			<td class="name">&nbsp;</td>
372
			<td class="value">
373
				<div id="file_perms_box" style="line-height:2em; position: relative; width: 100%;float:left; margin: 0; padding: 0; display: <?php if(isset($_SESSION['operating_system']) AND $_SESSION['operating_system'] == 'windows') { echo 'none'; } else { echo 'none'; } ?>;">
374
					<input type="checkbox" tabindex="6" name="world_writeable" id="world_writeable" value="true"<?php if(isset($_SESSION['world_writeable']) AND $_SESSION['world_writeable'] == true) { echo ' checked="checked'; } ?> />
375
 					<label style=" margin: 0;  " for="world_writeable">
378 376
						World-writeable file permissions (777)
379 377
					</label>
380
					<br />
381
					<font class="note">(Please note: only recommended for testing environments)</font>
378
				<br />
379
					<p class="warning">(Please note: only recommended for testing environments)</p>
382 380
				</div>
383 381
			</td>
384 382
		</tr>
385 383
		</table>
386
		<table cellpadding="5" cellspacing="0" width="100%" align="center">
384
		<table summary="" cellpadding="0" cellspacing="0">
387 385
    		<tr>
388
    			<td colspan="5">Please enter your MySQL database server details below...</td>
386
    			<td colspan="2" class="step-row"><h1 class="step-row">Step 5</h1>&nbsp;Please enter your MySQL database server details below...</td>
389 387
    		</tr>
390 388
    		<tr>
391
    			<td width="120" style="color: #666666;">Host Name:</td>
392
    			<td width="230">
393
    				<input <?php echo field_error('database_host');?> type="text" tabindex="7" name="database_host" style="width: 98%;" value="<?php if(isset($_SESSION['database_host'])) { echo $_SESSION['database_host']; } else { echo 'localhost'; } ?>" />
389
    			<td class="name">Host Name</td>
390
    			<td class="value">
391
    				<input <?php echo field_error('database_host');?> type="text" tabindex="7" name="database_host" value="<?php if(isset($_SESSION['database_host'])) { echo $_SESSION['database_host']; } else { echo 'localhost'; } ?>" />
394 392
    			</td>
395
    			<td width="7">&nbsp;</td>
396
    			<td width="70" style="color: #666666;">Username:</td>
397
    			<td>
398
    				<input <?php echo field_error('database_username');?> type="text" tabindex="9" name="database_username" style="width: 98%;" value="<?php if(isset($_SESSION['database_username'])) { echo $_SESSION['database_username']; } else { echo 'root'; } ?>" />
399
    			</td>
400 393
    		</tr>
401 394
    		<tr>
402
    			<td style="color: #666666;">Database Name:<br />[a-zA-Z0-9_-]</td>
403
    			<td>
404
    				<input <?php echo field_error('database_name');?> type="text" tabindex="8" name="database_name" style="width: 98%;" value="<?php if(isset($_SESSION['database_name'])) { echo $_SESSION['database_name']; } else { echo 'DatabaseName'; } ?>" />
395
    			<td class="name">Database Name&nbsp;([a-zA-Z0-9_-])</td>
396
    			<td class="value">
397
    				<input <?php echo field_error('database_name')?> type="text" tabindex="8" name="database_name" value="<?php if(isset($_SESSION['database_name'])) { echo $_SESSION['database_name']; } else { echo 'DatabaseName'; } ?>" />
405 398
    			</td>
406
    			<td>&nbsp;</td>
407
    			<td style="color: #666666;">Password:</td>
408
    			<td>
409
    				<input type="password" tabindex="10" name="database_password" style="width: 98%;" value="<?php if(isset($_SESSION['database_password'])) { echo $_SESSION['database_password']; } ?>" />
410
    			</td>
411 399
    		</tr>
412 400
		<tr>
413
			<td style="color: #666666;">Table Prefix:<br />[a-zA-Z0-9_]</td>
414
			<td>
415
				<input <?php echo field_error('table_prefix');?> type="text" tabindex="11" name="table_prefix" style="width: 250px;" value="<?php if(isset($_SESSION['table_prefix'])) { echo $_SESSION['table_prefix']; } else { echo 'wb_'; } ?>" />
401
			<td class="name">Table Prefix&nbsp;([a-zA-Z0-9_])</td>
402
			<td class="value">
403
				<input <?php echo field_error('table_prefix')?> type="text" tabindex="11" name="table_prefix" value="<?php if(isset($_SESSION['table_prefix'])) { echo $_SESSION['table_prefix']; } else { echo 'wb_'; } ?>" />
416 404
			</td>
417
			<td>&nbsp;</td>
418
			<td colspan="2">
405
		</tr>
406
		<tr>
407
    			<td class="name">Username:</td>
408
    			<td class="value">
409
    				<input <?php echo field_error('database_username');?> type="text" tabindex="9" name="database_username" value="<?php if(isset($_SESSION['database_username'])) { echo $_SESSION['database_username']; } else { echo 'root'; } ?>" />
410
    			</td>
411
		</tr>
412
		<tr>
413
    			<td class="name">Password:</td>
414
    			<td class="value">
415
    				<input type="password" tabindex="10" name="database_password" value="<?php if(isset($_SESSION['database_password'])) { echo $_SESSION['database_password']; } ?>" />
416
    			</td>
417
		</tr>
418
		<tr>
419
			<td class="name hide" colspan="2">
419 420
				<input type="checkbox" tabindex="12" name="install_tables" id="install_tables" value="true"<?php if(!isset($_SESSION['install_tables'])) { echo ' checked="checked"'; } elseif($_SESSION['install_tables'] == 'true') { echo ' checked="checked"'; } ?> />
420 421
				<label for="install_tables" style="color: #666666;">Install Tables</label>
421 422
				<br />
422
				<span style="font-size: 10px; color: #666666;">(Please note: May remove existing tables and data)</span>
423
				<span style="font-size: 1px; color: #666666;">(Please note: May remove existing tables and data)</span>
423 424
			</td>
424 425
		</tr>
426
		</table>
427
		<table summary="" cellpadding="0" cellspacing="0" >
428
		<tbody>
425 429
		<tr>
426
			<td colspan="5"><h1>Step 5</h1>Please enter your website title below...</td>
430
			<td colspan="2" class="step-row"><h1 class="step-row">Step 6</h1>&nbsp;Please enter your website title below...</td>
427 431
		</tr>
428 432
		<tr>
429
			<td style="color: #666666;" colspan="1">Website Title:</td>
430
			<td colspan="4">
431
				<input <?php echo field_error('website_title');?> type="text" tabindex="13" name="website_title" style="width: 99%;" value="<?php if(isset($_SESSION['website_title'])) { echo $_SESSION['website_title']; } else { echo 'Enter your website title'; } ?>" />
433
			<td class="name">Website Title:</td>
434
			<td class="value">
435
				<input <?php echo field_error('website_title');?> type="text" tabindex="13" name="website_title" value="<?php if(isset($_SESSION['website_title'])) { echo $_SESSION['website_title']; } else { echo 'Enter your website title'; } ?>" />
432 436
			</td>
433 437
		</tr>
438
		</tbody>
439
		</table>
440
		<table summary="" cellpadding="0" cellspacing="0" border="0">
434 441
		<tr>
435
			<td colspan="5"><h1>Step 6</h1>Please enter your Administrator account details below...</td>
442
			<td colspan="2" class="step-row"><h1 class="step-row">Step 7</h1> Please enter your Administrator account details below...</td>
436 443
		</tr>
437 444
		<tr>
438
			<td style="color: #666666;">Username:</td>
439
			<td>
440
				<input <?php echo field_error('admin_username');?> type="text" tabindex="14" name="admin_username" style="width: 98%;" value="<?php if(isset($_SESSION['admin_username'])) { echo $_SESSION['admin_username']; } else { echo 'admin'; } ?>" />
445
			<td class="name">Loginname:</td>
446
			<td class="value">
447
				<input <?php echo field_error('admin_username');?> type="text" tabindex="14" name="admin_username" value="<?php if(isset($_SESSION['admin_username'])) { echo $_SESSION['admin_username']; } else { echo 'admin'; } ?>" />
441 448
			</td>
442
			<td>&nbsp;</td>
443
			<td style="color: #666666;">Password:</td>
444
			<td>
445
				<input <?php echo field_error('admin_password');?> type="password" tabindex="16" name="admin_password" style="width: 98%;" value="" />
449
		</tr>
450
		<tr>
451
			<td class="name">Email:</td>
452
			<td class="value">
453
				<input <?php echo field_error('admin_email');?> type="text" tabindex="15" name="admin_email" value="<?php if(isset($_SESSION['admin_email'])) { echo $_SESSION['admin_email']; } ?>" />
446 454
			</td>
447 455
		</tr>
448 456
		<tr>
449
			<td style="color: #666666;">Email:</td>
450
			<td>
451
				<input <?php echo field_error('admin_email');?> type="text" tabindex="15" name="admin_email" style="width: 98%;" value="<?php if(isset($_SESSION['admin_email'])) { echo $_SESSION['admin_email']; } ?>" />
457
			<td class="name">Password:</td>
458
			<td class="value">
459
				<input <?php echo field_error('admin_password');?> type="password" tabindex="16" name="admin_password" value="" />
452 460
			</td>
453
			<td>&nbsp;</td>
454
			<td style="color: #666666;">Re-Password:</td>
455
			<td>
456
				<input <?php echo field_error('admin_repassword');?> type="password" tabindex="17" name="admin_repassword" style="width: 98%;" value=""  />
457
			</td>
458 461
		</tr>
459 462
		<tr>
460
			<td colspan="5" style="padding: 10px; padding-bottom: 0;"><h1 style="font-size: 0px;">&nbsp;</h1></td>
463
			<td class="name">Re-Password:</td>
464
			<td class="value">
465
				<input <?php echo field_error('admin_repassword');?> type="password" tabindex="17" name="admin_repassword" value=""  />
466
			</td>
461 467
		</tr>
462
		<tr>
463
			<td colspan="4">
464
				<table cellpadding="0" cellspacing="0" width="100%" border="0">
468
		</table>
469
		<table summary="" cellpadding="0" cellspacing="0">
465 470
				<tr valign="top">
466
					<td>Please note: &nbsp;</td>
471
					<td><strong>Please note: &nbsp;</strong></td>
472
				</tr>
473
				<tr valign="top">
467 474
					<td>
475
						<p class="warning">
468 476
						Website Baker is released under the
469 477
						<a href="http://www.gnu.org/licenses/gpl.html" target="_blank" tabindex="19">GNU General Public License</a>
470 478
						<br />
471 479
						By clicking install, you are accepting the license.
480
						</p>
472 481
					</td>
473 482
				</tr>
474
				</table>
475
			</td>
476
			<td colspan="1" align="right">
483
				<tr valign="top">
484
			<td>
485
			<p class="center">
477 486
				<?php if($installFlag == true) { ?>
478
				<input type="submit" tabindex="20" name="submit" value="Install WebsiteBaker" />
487
				<input type="submit" tabindex="20" name="install" value="Install WebsiteBaker" />
479 488
				<?php } else { ?>
480
				<input type="button" tabindex="20" name="submit" value="Check your Settings in Step1 or Step2" class="submit" />
489
				<input type="button" tabindex="20" name="restart" value="Check your Settings in Step1 or Step2" class="submit" onclick="javascript: window.location = '<?php print $_SERVER['SCRIPT_NAME'] ?>';" />
481 490
				<?php } ?>
491
			</p>
482 492
			</td>
483 493
		</tr>
484 494
		</table>
485
	</td>
486
</tr>
487
</table>
488 495

  
489 496
</form>
490 497

  
491
<table cellpadding="0" cellspacing="0" border="0" width="100%" style="padding: 10px 0px 10px 0px;">
492
<tr>
493
	<td align="center" style="font-size: 10px;">
498
	<div style="padding: 10px 0px 10px 0px; text-align:center;">
494 499
		<!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
495 500
		<a href="http://www.websitebaker.org/" style="color: #000000;" target="_blank">Website Baker</a>
496 501
		is	released under the
497 502
		<a href="http://www.gnu.org/licenses/gpl.html" style="color: #000000;" target="_blank">GNU General Public License</a>
498 503
		<!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
499
	</td>
500
</tr>
501
</table>
504
	</div >
505
</div>
502 506

  
503 507
</body>
504 508
</html>

Also available in: Unified diff