diff options
| -rw-r--r-- | phpBB/adm/style/admin.css | 38 | ||||
| -rw-r--r-- | phpBB/adm/style/install_header.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/installer_footer.html | 20 | ||||
| -rw-r--r-- | phpBB/adm/style/installer_form.html | 86 | ||||
| -rw-r--r-- | phpBB/adm/style/installer_header.html | 92 | ||||
| -rw-r--r-- | phpBB/adm/style/installer_install.html | 8 | ||||
| -rw-r--r-- | phpBB/adm/style/installer_main.html | 4 | 
7 files changed, 126 insertions, 126 deletions
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index ca5daf5bc5..992af0997f 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1801,7 +1801,7 @@ li.pagination ul {  }  .warningbox { -    background-color: #fca600; +	background-color: #fca600;  }  .successbox h3, .errorbox h3 { @@ -2523,28 +2523,28 @@ fieldset.permissions .padding {  }  #progress-bar { -    position: relative; -    width: 90%; -    height: 25px; -    margin: 20px auto; -    border: 1px solid #cecece; +	position: relative; +	width: 90%; +	height: 25px; +	margin: 20px auto; +	border: 1px solid #cecece;  }  #progress-bar #progress-bar-text { -    position: absolute; -    top: 0; -    width: 100%; -    text-align: center; -    line-height: 25px; -    font-weight: bold; +	position: absolute; +	top: 0; +	width: 100%; +	text-align: center; +	line-height: 25px; +	font-weight: bold;  }  #progress-bar #progress-bar-filler { -    display: block; -    position: relative; -    top: 0; -    left: 0; -    background-color: #3c84ad; -    width: 0; -    height: 25px; +	display: block; +	position: relative; +	top: 0; +	left: 0; +	background-color: #3c84ad; +	width: 0; +	height: 25px;  } diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index 8debfc69c0..6f7f129d39 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -18,7 +18,7 @@  		<form method="post" action="#">  			<fieldset class="nobg">  				<label for="language">{L_SELECT_LANG}{L_COLON}</label> -                {S_LANG_SELECT} +				{S_LANG_SELECT}  				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />  			</fieldset>  		</form> @@ -43,7 +43,7 @@  							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>  						<!-- END l_block1 -->  						<!-- BEGIN l_block2 --> -                            <li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li> +							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>  						<!-- END l_block2 -->  						</ul>  						</div> diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html index 2c70d4d5d3..617d3dc254 100644 --- a/phpBB/adm/style/installer_footer.html +++ b/phpBB/adm/style/installer_footer.html @@ -1,14 +1,14 @@ -                    </div> -                </div><!-- /#main --> -            </div> -        </div><!-- /#acp --> -    </div> +					</div> +				</div><!-- /#main --> +			</div> +		</div><!-- /#acp --> +	</div> -    <div id="page-footer"> -        <div class="copyright"> -            Powered by <a href="https://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Limited -        </div> -    </div> +	<div id="page-footer"> +		<div class="copyright"> +			Powered by <a href="https://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Limited +		</div> +	</div>  </div>  <script type="text/javascript" src="{T_JQUERY_LINK}"></script> diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html index 3cb4185bc6..669f7aa834 100644 --- a/phpBB/adm/style/installer_form.html +++ b/phpBB/adm/style/installer_form.html @@ -4,53 +4,53 @@  <fieldset>  <!-- ENDIF --> -    <!-- BEGIN options --> -        <!-- IF options.S_LEGEND --> -            <!-- IF not options.S_FIRST_ROW --> -            </fieldset> +	<!-- BEGIN options --> +		<!-- IF options.S_LEGEND --> +			<!-- IF not options.S_FIRST_ROW --> +			</fieldset> -            <fieldset> -            <!-- ENDIF --> -        <legend>{options.LEGEND}</legend> -        <!-- ELSE --> +			<fieldset> +			<!-- ENDIF --> +		<legend>{options.LEGEND}</legend> +		<!-- ELSE --> -            <!-- IF options.TYPE <> 'submit' --> -        <dl> -            <dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> -            <dd> -                <!-- IF options.TYPE == 'text' --> -                <input type="text" name="{options.KEY}" value="{options.DEFAULT}" /> -                <!-- ENDIF --> -                <!-- IF options.TYPE == 'email' --> -                <input type="email" name="{options.KEY}" value="{options.DEFAULT}" /> -                <!-- ENDIF --> -                <!-- IF options.TYPE == 'password' --> -                <input type="password" name="{options.KEY}" /> -                <!-- ENDIF --> -                <!-- IF options.TYPE == 'select' --> -                <select name="{options.KEY}"> -                    <!-- BEGIN options.OPTIONS --> -                    <option value="{options.OPTIONS.value}"<!-- IF options.OPTIONS.selected --> selected<!-- ENDIF -->>{options.OPTIONS.label}</option> -                    <!-- END options.OPTIONS --> -                </select> -                <!-- ENDIF --> -                <!-- IF options.TYPE == 'radio' --> -                    <!-- BEGIN options.OPTIONS --> -                <input type="radio" name="{options.KEY}" value="{options.OPTIONS.value}" <!-- IF options.OPTIONS.selected -->checked<!-- ENDIF --> /> {options.OPTIONS.label} -                    <!-- END options.OPTIONS --> -                <!-- ENDIF --> -            </dd> -        </dl> -            <!-- ELSE --> +			<!-- IF options.TYPE <> 'submit' --> +		<dl> +			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> +			<dd> +				<!-- IF options.TYPE == 'text' --> +				<input type="text" name="{options.KEY}" value="{options.DEFAULT}" /> +				<!-- ENDIF --> +				<!-- IF options.TYPE == 'email' --> +				<input type="email" name="{options.KEY}" value="{options.DEFAULT}" /> +				<!-- ENDIF --> +				<!-- IF options.TYPE == 'password' --> +				<input type="password" name="{options.KEY}" /> +				<!-- ENDIF --> +				<!-- IF options.TYPE == 'select' --> +				<select name="{options.KEY}"> +					<!-- BEGIN options.OPTIONS --> +					<option value="{options.OPTIONS.value}"<!-- IF options.OPTIONS.selected --> selected<!-- ENDIF -->>{options.OPTIONS.label}</option> +					<!-- END options.OPTIONS --> +				</select> +				<!-- ENDIF --> +				<!-- IF options.TYPE == 'radio' --> +					<!-- BEGIN options.OPTIONS --> +				<input type="radio" name="{options.KEY}" value="{options.OPTIONS.value}" <!-- IF options.OPTIONS.selected -->checked<!-- ENDIF --> /> {options.OPTIONS.label} +					<!-- END options.OPTIONS --> +				<!-- ENDIF --> +			</dd> +		</dl> +			<!-- ELSE -->  <!-- IF S_FORM_ELEM_COUNT > 1 -->  </fieldset>  <!-- ENDIF --> -                <fieldset class="submit-buttons"> -                    <legend>{L_SUBMIT}</legend> -                    <input class="button1" type="submit" name="{options.KEY}" value="{options.TITLE}" /> -                </fieldset> -            <!-- ENDIF --> -        <!-- ENDIF--> -    <!-- END options --> +				<fieldset class="submit-buttons"> +					<legend>{L_SUBMIT}</legend> +					<input class="button1" type="submit" name="{options.KEY}" value="{options.TITLE}" /> +				</fieldset> +			<!-- ENDIF --> +		<!-- ENDIF--> +	<!-- END options -->  <!-- ENDIF -->  </form> diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html index ada6553aec..775caa7c67 100644 --- a/phpBB/adm/style/installer_header.html +++ b/phpBB/adm/style/installer_header.html @@ -1,57 +1,57 @@  <!DOCTYPE html>  <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">  <head> -    <meta charset="utf-8"> -    <meta name="viewport" content="width=device-width, initial-scale=1" /> -    <!-- IF META -->{META}<!-- ENDIF --> -    <title>{PAGE_TITLE}</title> +	<meta charset="utf-8"> +	<meta name="viewport" content="width=device-width, initial-scale=1" /> +	<!-- IF META -->{META}<!-- ENDIF --> +	<title>{PAGE_TITLE}</title> -    <link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" /> +	<link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />  </head>  <body class="{S_CONTENT_DIRECTION} nojs">  <div id="wrap"> -    <div id="page-header"> -        <h1>{L_INSTALL_PANEL}</h1> -        <p id="skip"><a href="#acp">{L_SKIP}</a></p> -        <!-- IF S_LANG_SELECT --> -        <form method="post" action="#" id="language_selector"> -            <fieldset class="nobg"> -                <label for="language">{L_SELECT_LANG}{L_COLON}</label> -                <select  id="language" name="language"> -                    <!-- BEGIN language_select_item --> -                    <option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option> -                    <!-- END language_select_item --> -                </select> -                <input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" /> -            </fieldset> -        </form> -        <!-- ENDIF --> -    </div> +	<div id="page-header"> +		<h1>{L_INSTALL_PANEL}</h1> +		<p id="skip"><a href="#acp">{L_SKIP}</a></p> +		<!-- IF S_LANG_SELECT --> +		<form method="post" action="#" id="language_selector"> +			<fieldset class="nobg"> +				<label for="language">{L_SELECT_LANG}{L_COLON}</label> +				<select  id="language" name="language"> +					<!-- BEGIN language_select_item --> +					<option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option> +					<!-- END language_select_item --> +				</select> +				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" /> +			</fieldset> +		</form> +		<!-- ENDIF --> +	</div> -    <div id="page-body"> -        <div id="tabs"> -            <ul> -                <!-- BEGIN t_block1 --> -                <li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li> -                <!-- END t_block1 --> -            </ul> -        </div> +	<div id="page-body"> +		<div id="tabs"> +			<ul> +				<!-- BEGIN t_block1 --> +				<li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li> +				<!-- END t_block1 --> +			</ul> +		</div> -        <div id="acp"> -            <div id="content"> -                <div id="menu"> -                    <div class="menu-block no-header"> -                        <ul> -                            <!-- BEGIN l_block1 --> -                            <li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li> -                            <!-- END l_block1 --> -                            <!-- BEGIN l_block2 --> -                            <li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF --> id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE}</span></li> -                            <!-- END l_block2 --> -                        </ul> -                    </div> -                </div> +		<div id="acp"> +			<div id="content"> +				<div id="menu"> +					<div class="menu-block no-header"> +						<ul> +							<!-- BEGIN l_block1 --> +							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li> +							<!-- END l_block1 --> +							<!-- BEGIN l_block2 --> +							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF --> id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE}</span></li> +							<!-- END l_block2 --> +						</ul> +					</div> +				</div> -                <div id="main" class="install-body"> -                    <div class="main"> +				<div id="main" class="install-body"> +					<div class="main"> diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html index 175c6eac67..53a91f2700 100644 --- a/phpBB/adm/style/installer_install.html +++ b/phpBB/adm/style/installer_install.html @@ -3,10 +3,10 @@  <p>{CONTENT}</p>  <!-- IF SHOW_INSTALL_START_FORM -->  <form id="install_install" method="post" action="{U_ACTION}"> -    <fieldset class="submit-buttons"> -        <legend>{L_SUBMIT}</legend> -        <input class="button1" name="install" type="submit" value="{L_INSTALL}" /> -    </fieldset> +	<fieldset class="submit-buttons"> +		<legend>{L_SUBMIT}</legend> +		<input class="button1" name="install" type="submit" value="{L_INSTALL}" /> +	</fieldset>  </form>  <!-- ENDIF -->  <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js --> diff --git a/phpBB/adm/style/installer_main.html b/phpBB/adm/style/installer_main.html index ed65da8a68..f14fe4da70 100644 --- a/phpBB/adm/style/installer_main.html +++ b/phpBB/adm/style/installer_main.html @@ -1,6 +1,6 @@  <!-- INCLUDE installer_header.html --> -    <h1>{TITLE}</h1> -    <p>{BODY}</p> +	<h1>{TITLE}</h1> +	<p>{BODY}</p>  <!-- INCLUDE installer_footer.html -->  | 
