Browse code

Installer layout fixed - Previous layout behavior restored to site settings

Clarissa Walker authored on 2026/07/27 17:42:50
Showing 2 changed files
... ...
@@ -396,8 +396,8 @@ else if(isset($_POST['submit'])) {
396 396
 			</tr>
397 397
 			<tr>
398 398
 				<td colspan='2'><fieldset style='margin: 0 auto;'><legend>"._IMAGESIZE." <a href='#' class='pophelp'>[?]<span>"._HELP_IMAGESIZE."</span></a></legend>
399
-				<label for='newimageheight'>"._MAXHEIGHT.":</label> <span style='padding-left: 19.3%;'> <input  type='text' class='textbox=' name='newimageheight' value='$imageheight' size='5'> <br />
400
-				<label for='newimagewidth'>"._MAXWIDTH.":</label> <span style='padding-left: 20.3%;'> <input  type='text' class='textbox=' name='newimagewidth' value='$imagewidth' size='5'></fieldset></td>
399
+				<label for='newimageheight'>"._MAXHEIGHT.":</label> <span style='padding-left: 24.3%;'> <input  type='text' class='textbox=' name='newimageheight' value='$imageheight' size='5'> <br />
400
+				<label for='newimagewidth'>"._MAXWIDTH.":</label> <span style='padding-left: 25.3%;'> <input  type='text' class='textbox=' name='newimagewidth' value='$imagewidth' size='5'></fieldset></td>
401 401
 			</tr>
402 402
 			<tr>
403 403
 				<td><label for='newstore'>"._HOWSTORE.":</label></td><td><select name='newstore' onChange='if (this.disabled) this.selectedIndex=0' disabled>
... ...
@@ -410,8 +410,8 @@ else if(isset($_POST['submit'])) {
410 410
 			</tr>
411 411
 			<tr>
412 412
 				<td colspan='2'><fieldset style='margin: 0 auto;'><legend>"._MAXMINWORDS."<a href='#' class='pophelp'>[?]<span>"._HELP_MINMAXWORDS."</span></a></legend>
413
-				<label for='newminwords'>"._MIN.":</label> <span style='padding-left: 33.44%;'> <input  type='text' class='textbox=' name='newminwords' value='$minwords' size='5'> <br />
414
-				<label for='newmaxwords'>"._MAX.":</label> <span style='padding-left: 32.7%;'> <input  type='text' class='textbox=' name='newmaxwords' value='$maxwords' size='7'></fieldset></td></tr>";
413
+				<label for='newminwords'>"._MIN.":</label> <span style='padding-left: 38.44%;'> <input  type='text' class='textbox=' name='newminwords' value='$minwords' size='5'> <br />
414
+				<label for='newmaxwords'>"._MAX.":</label> <span style='padding-left: 37.7%;'> <input  type='text' class='textbox=' name='newmaxwords' value='$maxwords' size='7'></fieldset></td></tr>";
415 415
 	}
416 416
 	else if($sect == "sitesettings") {
417 417
 		$output .= "<div class='sectionheader'>"._SITESETTINGS."</div>
... ...
@@ -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");
... ...
@@ -1047,13 +1049,25 @@ if(!empty(\$sitekey)) \$dbconnect = dbconnect(\$dbhost, \$dbuser,\$dbpass, \$dbn
1047 1049
 			else
1048 1050
 			{
1049 1051
 				$output .=
1050
-					"<form method='POST' enctype='multipart/form-data' action='install.php?step=1' class='tblborder' style='width: 350px; margin: 1em auto;'>
1051
-						<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>
1052
-						<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>
1053
-						<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>
1054
-						<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>
1055
-						<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>
1056
-						<div><label for=\"language\">" . _LANGUAGE . ":</label> <select name=\"language\">";
1052
+					"<form method='POST' enctype='multipart/form-data' action='install.php?step=1' class='tblborder' style='width: 45%; margin: 1em auto;'>
1053
+						<table class='acp' style='margin: 0 auto;'>
1054
+							<tr>
1055
+								<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>
1056
+							</tr>
1057
+							<tr>
1058
+								<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>
1059
+							</tr>
1060
+							<tr>
1061
+								<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>
1062
+							</tr>
1063
+							<tr>
1064
+								<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>
1065
+							</tr>
1066
+							<tr>
1067
+								<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>
1068
+							</tr>
1069
+							<tr>
1070
+								<td><label for=\"language\">" . _LANGUAGE . ":</label></td><td><select name=\"language\">";
1057 1071
 				$directory = opendir("../languages");
1058 1072
 				while ($filename = readdir($directory))
1059 1073
 				{
... ...
@@ -1064,9 +1078,12 @@ if(!empty(\$sitekey)) \$dbconnect = dbconnect(\$dbhost, \$dbuser,\$dbpass, \$dbn
1064 1078
 				}
1065 1079
 				closedir($directory);
1066 1080
 				$output .=
1067
-					"</select> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_LANGUAGE . "</span></A></div>
1068
-						<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 />
1069
-						<div style='text-align: center; margin: 1em;'><INPUT type=\"submit\"class=\"button\" name=\"submit\" value=\"submit\"></div>
1081
+					"</select> <A HREF=\"#\" class=\"pophelp\">[?]<span>" . _HELP_LANGUAGE . "</span></A></td>
1082
+							</tr>
1083
+								<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>
1084
+							</tr>
1085
+							<tr><td colspan='2'><div style='text-align: center; margin: 1em;'><INPUT type=\"submit\"class=\"button\" name=\"submit\" value=\"submit\"></div></td></tr>
1086
+						</table>
1070 1087
 					</form>";
1071 1088
 			}
1072 1089
 		}