mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-08 16:45:19 +02:00
Should be a fix for another global_var issue bug #492118 also modded install template to use .css
git-svn-id: file:///svn/phpbb/trunk@1600 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
parent
e6ee41ce9f
commit
b1b4c5a5e3
@ -219,7 +219,7 @@ $dbname = ( !empty($HTTP_POST_VARS['dbname']) ) ? $HTTP_POST_VARS['dbname'] : ""
|
||||
|
||||
$table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ) ? $HTTP_POST_VARS['prefix'] : "";
|
||||
|
||||
$admin_username = ( !empty($HTTP_POST_VARS['admin_user']) ) ? $HTTP_POST_VARS['admin_user'] : "";
|
||||
$admin_name = ( !empty($HTTP_POST_VARS['admin_name']) ) ? $HTTP_POST_VARS['admin_name'] : "";
|
||||
$admin_pass1 = ( !empty($HTTP_POST_VARS['admin_pass1']) ) ? $HTTP_POST_VARS['admin_pass1'] : "";
|
||||
$admin_pass2 = ( !empty($HTTP_POST_VARS['admin_pass2']) ) ? $HTTP_POST_VARS['admin_pass2'] : "";
|
||||
|
||||
@ -556,7 +556,7 @@ else if( ( empty($install_step) || $admin_pass1 != $admin_pass2 || $dbhost == ""
|
||||
"DB_HOST" => ( $dbhost != "" ) ? $dbhost : "",
|
||||
"DB_USER" => ( $dbuser != "" ) ? $dbuser : "",
|
||||
"DB_PASSWD" => ( $dbpasswd != "" ) ? $dbpasswd : "",
|
||||
"ADMIN_USERNAME" => ( $admin_username != "" ) ? $admin_username : "",
|
||||
"ADMIN_USERNAME" => ( $admin_name != "" ) ? $admin_name : "",
|
||||
|
||||
"S_LANG_SELECT" => $lang_options,
|
||||
"S_DBMS_SELECT" => $dbms_options,
|
||||
|
||||
@ -1,94 +1,28 @@
|
||||
<!-- DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" -->
|
||||
<!-- <html xmlns="http://www.w3.org/1999/xhtml"> -->
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
|
||||
<meta http-equiv="Content-Style-Type" content="text/css" />
|
||||
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
|
||||
<meta http-equiv="Content-Style-Type" content="text/css">
|
||||
<title>{L_INSTALLATION}</title>
|
||||
<link rel="stylesheet" href="templates/subSilver/subSilver.css" type="text/css">
|
||||
<style type="text/css">
|
||||
<!--
|
||||
/* subSilver Theme for phpBB2
|
||||
* Created by subBlue design
|
||||
* http://www.subBlue.com
|
||||
*/
|
||||
|
||||
body { background-color:#E5E5E5;
|
||||
scrollbar-face-color: #C8D1D7; scrollbar-highlight-color: #EAF0F7;
|
||||
scrollbar-shadow-color: #95AFC4; scrollbar-3dlight-color: #D6DDE2;
|
||||
scrollbar-arrow-color: #006699; scrollbar-track-color: #EFEFEF;
|
||||
scrollbar-darkshadow-color: #7294AF;
|
||||
}
|
||||
|
||||
font { font-family: Verdana, Arial, Helvetica, sans-serif }
|
||||
td { font-family: Verdana, Arial, Helvetica, sans-serif }
|
||||
th { font-family: Verdana, Arial, Helvetica, sans-serif }
|
||||
P { font-family: Verdana, Arial, Helvetica, sans-serif }
|
||||
hr { height: 1px; color:#c2cdd6 }
|
||||
|
||||
/* Forum colours */
|
||||
.bodyline { background-color:#FFFFFF; border: #AEBDC4; border-style: solid; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px }
|
||||
.forumline { background-color:#FFFFFF; border: 2px #006699 solid }
|
||||
|
||||
/* Main table cell colours and backgrounds */
|
||||
TH { background-color: #1B7CAD; height: 25px; font-size: 11px; line-height : 100%; font-weight: bold; color: #FFB163; background-image: url(templates/subSilver/images/cellpic3.gif) }
|
||||
TD.cat { background-color: #CBD3D9; height: 28px; background-image: url(templates/subSilver/images/cellpic1.gif) }
|
||||
TD.row1 { background-color: #EFEFEF }
|
||||
TD.row2 { background-color: #DEE3E7 }
|
||||
|
||||
/* General normal text */
|
||||
.gen { font-size : 12px; color : #000000; }
|
||||
a.gen { color: #006699; text-decoration: none; }
|
||||
a:hover.gen { color: #C23030; text-decoration: underline; }
|
||||
|
||||
/* General small */
|
||||
.gensmall { font-size : 10px; color : #000000; }
|
||||
a.gensmall { color: #006699; text-decoration: none; }
|
||||
a:hover.gensmall { color: #C23030; text-decoration: underline; }
|
||||
|
||||
/* Form elements */
|
||||
input,textarea, select {
|
||||
color : #000000;
|
||||
font-family : Verdana, Arial, Helvetica, sans-serif;
|
||||
font-size : 11px;
|
||||
font-weight : normal;
|
||||
border-color : #000000;
|
||||
}
|
||||
|
||||
/* The text input fields background colour */
|
||||
input.post, textarea.post, select {
|
||||
background-color : #FFFFFF;
|
||||
}
|
||||
|
||||
input { text-indent : 2px; }
|
||||
|
||||
/* The main submit button option */
|
||||
input.mainoption {
|
||||
background-color : #FAFAFA;
|
||||
font-weight : bold;
|
||||
}
|
||||
|
||||
/* None bold submit button */
|
||||
input.liteoption {
|
||||
background-color : #FAFAFA;
|
||||
font-weight : normal;
|
||||
}
|
||||
/* Specifiy background images for selected styles
|
||||
This can't be done within the external style sheet as NS4 sees image paths relative to
|
||||
the page which called the style sheet (i.e. this page in the root phpBB directory)
|
||||
whereas all other browsers see image paths relative to the style sheet. Stupid NS again!
|
||||
*/
|
||||
TH { background-image: url(templates/subSilver/images/cellpic3.gif) }
|
||||
TD.cat { background-image: url(templates/subSilver/images/cellpic1.gif) }
|
||||
TD.rowpic { background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y }
|
||||
td.icqback { background-image: url(templates/subSilver/images/icon_icq_add.gif); background-repeat: no-repeat }
|
||||
TD.catHead,TD.catSides,TD.catLeft,TD.catRight,TD.catBottom { background-image: url(templates/subSilver/images/cellpic1.gif) }
|
||||
|
||||
/* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */
|
||||
@import url("templates/subSilver/formIE.css");
|
||||
|
||||
.copyright { font-family: Verdana, Arial, Helvetica, sans-serif; color: #555555; font-size: 10px; letter-spacing: -1px;}
|
||||
a.copyright { color: #333333; text-decoration: none;}
|
||||
a.copyright:hover { color: #000000; text-decoration: underline;}
|
||||
|
||||
.maintitle { font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-size : 22px; font-weight : bold; text-decoration : none; line-height : 120%; color : #000000;}
|
||||
|
||||
@import url("templates/subSilver/formIE.css");
|
||||
-->
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body bgcolor="#E5E5E5" text="#000000" link="#006699" vlink="#5584AA">
|
||||
|
||||
<table width="100%" border="0" cellspacing="0" cellpadding="10" align="center">
|
||||
@ -133,10 +67,6 @@ a.copyright:hover { color: #000000; text-decoration: underline;}
|
||||
<td class="row1" align="right"><span class="gen">{L_UPGRADE}:</span></td>
|
||||
<td class="row2">{S_UPGRADE_SELECT}</td>
|
||||
</tr>
|
||||
<!-- tr>
|
||||
<td class="row1" align="right"><span class="gen">{L_DOMAIN_NAME}: </span></td>
|
||||
<td class="row2"><input type="text" name="cookiedomain" value="{COOKIE_DOMAIN}" /></td>
|
||||
</tr -->
|
||||
<tr>
|
||||
<th colspan="2">{L_DATABASE_CONFIGURATION}</th>
|
||||
</tr>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user