Browse code

Installer layout fixes

Clarissa Walker authored on 2026/08/22 20:44:53
Showing 1 changed files
... ...
@@ -136,15 +136,6 @@ include("../version.php");
136 136
 echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">
137 137
 <html><head><title>eFiction {$version} Install</title>
138 138
 <style>
139
-LABEL { float: left; display: block; width: 45%; text-align: right; padding-right: 10px; clear: left;}
140
-.row { float: left; width: 99%; }
141
-#settingsform FORM { width: 80%; margin; 0 auto; }
142
-#settingsform LABEL { float: left; display: block; width: 30%; text-align: right; padding-right: 10px; clear: left; }
143
-#settingsform .fieldset SPAN { float: left; display: block; width: 30%; text-align: right; padding-right: 10px; clear: left;}
144
-#settingsform .fieldset LABEL { float: none; width: auto; display: inline; text-align: left; clear: none; }
145
-#settingsform .tinytoggle { text-align: center; }
146
-#settingsform .tinytoggle LABEL { float: none; display: inline; width: auto; text-align: center; padding: 0; clear: none; }
147
-#settingsform #submit { display: block; margin: 1ex auto; }
148 139
 a.pophelp{
149 140
     position: relative; /* this is the key*/
150 141
     z-index:24;
... ...
@@ -171,6 +162,17 @@ a.pophelp:hover span{ /*the span will display just on :hover state*/
171 162
 </style>
172 163
 <link rel=\"stylesheet\" type=\"text/css\" href='../default_tpls/style.css'></head>";
173 164
 
165
+// leftover data that would be right after the <style> tag above
166
+// LABEL { float: left; display: block; width: 45%; text-align: right; padding-right: 10px; clear: left;}
167
+// .row { float: left; width: 99%; }
168
+// #settingsform FORM { width: 80%; margin; 0 auto; }
169
+// #settingsform LABEL { float: left; display: block; width: 30%; text-align: right; padding-right: 10px; clear: left; }
170
+// #settingsform .fieldset SPAN { float: left; display: block; width: 30%; text-align: right; padding-right: 10px; clear: left;}
171
+// #settingsform .fieldset LABEL { float: none; width: auto; display: inline; text-align: left; clear: none; }
172
+// #settingsform .tinytoggle { text-align: center; }
173
+// #settingsform .tinytoggle LABEL { float: none; display: inline; width: auto; text-align: center; padding: 0; clear: none; }
174
+// #settingsform #submit { display: block; margin: 1ex auto; }
175
+
174 176
 $tpl = new TemplatePower("../default_tpls/default.tpl");
175 177
 $tpl->assignInclude("header", "./../default_tpls/header.tpl");
176 178
 $tpl->assignInclude("footer", "./../default_tpls/footer.tpl");
... ...
@@ -208,13 +210,27 @@ switch ($_GET['step'])
208 210
 		else
209 211
 		{
210 212
 			$output .= "<div id='pagetitle'>" . _ADMINACCT . "</div><form method=\"POST\" class='tblborder' style='margin: 1em auto; width: 400px;' enctype=\"multipart/form-data\" action=\"install.php?step=9\">
211
-			<div class='row'><label for='newpenname'>" . _PENNAME . ":</label> 
212
-			<input name=\"newpenname\" type=\"text\" class=\"textbox\" maxlength=\"200\" value=\"" . $user['penname'] . "\"></div>
213
-		 	<div class='row'><label for='email'>" . _EMAIL . ":</label> <INPUT  type=\"text\" class=\"textbox=\" name=\"email\" value=\"" . $user['email'] .
214
-				"\" maxlength=\"200\"></div>
215
-			<div class='row'><label for='password'>" . _PASSWORD . ":</label>  <INPUT name=\"password\" class=\"textbox\" value=\"\" type=\"password\"></div> 
216
-			<div class='row'><label for='password2'>" . _PASSWORD2 . ":</label> <INPUT name=\"password2\" class=\"textbox=\" value=\"\" type=\"password\"></div>
217
-			<div style='text-align: center;'><INPUT type=\"submit\"class=\"button\" name=\"submit\" value=\"submit\"></div></form>";
213
+			<table class='acp' style='margin: 0 auto;'>
214
+				<tr>
215
+					<td><label for='newpenname'>" . _PENNAME . ":</label></td>
216
+					<td><input name=\"newpenname\" type=\"text\" class=\"textbox\" maxlength=\"200\" value=\"" . $user['penname'] . "\"></td>
217
+				</tr>
218
+				<tr>
219
+					<td><label for='email'>" . _EMAIL . ":</label></td>
220
+					<td><INPUT  type=\"text\" class=\"textbox=\" name=\"email\" value=\"" . $user['email'] . "\"maxlength=\"200\"></td>
221
+				</tr>
222
+				<tr>
223
+					<td><label for='password'>" . _PASSWORD . ":</label></td>
224
+					<td><INPUT name=\"password\" class=\"textbox\" value=\"\" type=\"password\"></td>
225
+				</tr>
226
+				<tr>
227
+					<td><label for='password2'>" . _PASSWORD2 . ":</label></td>
228
+					<td><INPUT name=\"password2\" class=\"textbox=\" value=\"\" type=\"password\"></td>
229
+				</tr>
230
+			</table>
231
+			<div style='text-align: center; margin: 0.5em;'><INPUT type=\"submit\"class=\"button\" name=\"submit\" value=\"submit\"></div>
232
+			</div></form>
233
+			";
218 234
 		}
219 235
 		break;
220 236
 
... ...
@@ -1046,13 +1062,25 @@ if(!empty(\$sitekey)) \$dbconnect = dbconnect(\$dbhost, \$dbuser,\$dbpass, \$dbn
1046 1062
 			else
1047 1063
 			{
1048 1064
 				$output .=
1049
-					"<form method='POST' enctype='multipart/form-data' action='install.php?step=1' class='tblborder' style='width: 350px; margin: 1em auto;'>
1050
-						<div><label for='dbhost'>" . _DBHOST . "</label><input type='text'  name='dbhost' id='dbhost'" . (!empty($dbhost) ? "value='$dbhost'" : "value='localhost'") . "> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_DBHOST . "</span></A></div>
1051
-						<div><label for='dbname'>" . _DBNAME . "</label><input type='text' name='dbname' id='dbname'" . (!empty($dbname) ? "value='$dbname'" : "") . "> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_DBNAME . "</span></A></div>
1052
-						<div><label for='dbuser'>" . _DBUSER . "</label><input type='text' name='dbuser' id='dbuser'" . (!empty($dbuser) ? "value='$dbuser'" : "") . "> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_DBUSER . "</span></A></div>
1053
-						<div><label for='dbpass'>" . _DBPASS . "</label><input type='password' name='dbpass' id='dbpass'" . (!empty($dbpass) ? "value='$dbpass'" : "") . "> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_DBPASS . "</span></A></div>
1054
-						<div><label for='sitekey'>" . _SITEKEY . "</label><input type='text' name='sitekey' value='" . (!empty($sitekey) ? $sitekey : random_string($randomcharset, 10)) . "' id='sitekey'> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_INSTALL_SITEKEY . "</span></A></div>
1055
-						<div><label for=\"language\">" . _LANGUAGE . ":</label> <select name=\"language\">";
1065
+					"<form method='POST' enctype='multipart/form-data' action='install.php?step=1' class='tblborder' style='width: 45%; margin: 1em auto;'>
1066
+						<table class='acp' style='margin: 0 auto;'>
1067
+							<tr>
1068
+								<td><label for='dbhost'>" . _DBHOST . "</label></td><td><input type='text'  name='dbhost' id='dbhost'" . (!empty($dbhost) ? "value='$dbhost'" : "value='localhost'") . "> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_DBHOST . "</span></A></td>
1069
+							</tr>
1070
+							<tr>
1071
+								<td><label for='dbname'>" . _DBNAME . "</label></td><td><input type='text' name='dbname' id='dbname'" . (!empty($dbname) ? "value='$dbname'" : "") . "> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_DBNAME . "</span></A></td>
1072
+							</tr>
1073
+							<tr>
1074
+								<td><label for='dbuser'>" . _DBUSER . "</label></td><td><input type='text' name='dbuser' id='dbuser'" . (!empty($dbuser) ? "value='$dbuser'" : "") . "> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_DBUSER . "</span></A></td>
1075
+							</tr>
1076
+							<tr>
1077
+								<td><label for='dbpass'>" . _DBPASS . "</label></td><td><input type='password' name='dbpass' id='dbpass'" . (!empty($dbpass) ? "value='$dbpass'" : "") . "> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_DBPASS . "</span></A></td>
1078
+							</tr>
1079
+							<tr>
1080
+								<td><label for='sitekey'>" . _SITEKEY . "</label></td><td><input type='text' name='sitekey' value='" . (!empty($sitekey) ? $sitekey : random_string($randomcharset, 10)) . "' id='sitekey'> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_INSTALL_SITEKEY . "</span></A></td>
1081
+							</tr>
1082
+							<tr>
1083
+								<td><label for=\"language\">" . _LANGUAGE . ":</label></td><td><select name=\"language\">";
1056 1084
 				$directory = opendir("../languages");
1057 1085
 				while ($filename = readdir($directory))
1058 1086
 				{
... ...
@@ -1063,9 +1091,12 @@ if(!empty(\$sitekey)) \$dbconnect = dbconnect(\$dbhost, \$dbuser,\$dbpass, \$dbn
1063 1091
 				}
1064 1092
 				closedir($directory);
1065 1093
 				$output .=
1066
-					"</select> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_LANGUAGE . "</span></A></div>
1067
-						<label for='settingsprefix'>" . _SETTINGSPREFIX . "</label><input type='text' name='settingsprefix' id='settingsprefix'" . (isset($settingsprefix) ? "value='$settingsprefix'" : "") . "> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_SETTINGSPREFIX . "</span></A><br />
1068
-						<div style='text-align: center; margin: 1em;'><INPUT type=\"submit\"class=\"button\" name=\"submit\" value=\"submit\"></div>
1094
+					"</select> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_LANGUAGE . "</span></A></td>
1095
+							</tr>
1096
+								<td><label for='settingsprefix'>" . _SETTINGSPREFIX . "</label></td><td><input type='text' name='settingsprefix' id='settingsprefix'" . (isset($settingsprefix) ? "value='$settingsprefix'" : "") . "> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_SETTINGSPREFIX . "</span></A></td>
1097
+							</tr>
1098
+							<tr><td colspan='2'><div style='text-align: center; margin: 1em;'><INPUT type=\"submit\"class=\"button\" name=\"submit\" value=\"submit\"></div></td></tr>
1099
+						</table>
1069 1100
 					</form>";
1070 1101
 			}
1071 1102
 		}