adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-03 16:32:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk 2747:

Browse Source 
- Install process now looks like goto/roma.
- Move install.tpl to goto template.
- add charset utf8 to fatal error function.
- Check php version on install and upgrade, and die if < 5. 


git-svn-id: http://piwigo.org/svn/branches/2.0@2748 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2008-10-15 17:55:18 +00:00
parent fd1badf24b
commit 5ce101c193
13 changed files with 243 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/template/goto/install.tpl
+152
View File
@@ -0,0 +1,152 @@
{* $Id$ *}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html lang="fr">
<head>
<meta http-equiv="Content-Type" content="text/html; charset={$T_CONTENT_ENCODING}">
<meta http-equiv="Content-script-type" content="text/javascript">
<meta http-equiv="Content-Style-Type" content="text/css">
<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css">
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
{literal}
<style type="text/css">
.content {
width: 800px;
margin: auto;
text-align: center;
}
.table2 {
width: 100%;
margin-bottom: 1em !important;
}
TD {
text-align: left;
padding: 0.1em 0.5em;
height: 2.5em;
}
.sql_content {
color: #ff3363;
}
</style>
{/literal}
<title>Piwigo {$RELEASE} - {'Installation'|@translate}</title>
</head>
<body>
<div id="headbranch"></div> {* Dummy block for double background management *}
<div id="theHeader"></div>
<div id="content" class="content">
<h2>Piwigo {$RELEASE} - {'Installation'|@translate}</h2>
{if isset($errors)}
<div class="errors">
<ul>
{foreach from=$errors item=error}
<li>{$error}</li>
{/foreach}
</ul>
</div>
{/if}
{if isset($infos)}
<div class="infos">
<ul>
{foreach from=$infos item=info}
<li>{$info}</li>
{/foreach}
</ul>
</div>
{/if}
{if isset($install)}
<form method="POST" action="{$F_ACTION}" name="install_form">
<table class="table2">
<tr class="throw">
<th colspan="2">{'Initial_config'|@translate}</th>
</tr>
<tr>
<td style="width: 30%">{'Default_lang'|@translate}</td>
<td>
<select name="language" onchange="document.location = 'install.php?language='+this.options[this.selectedIndex].value;">
{html_options options=$language_options selected=$language_selection}
</select>
</td>
</tr>
</table>
<table class="table2">
<tr class="throw">
<th colspan="3">{'step1_title'|@translate}</th>
</tr>
<tr>
<td style="width: 30%;">{'step1_host'|@translate}</td>
<td align=center><input type="text" name="dbhost" value="{$F_DB_HOST}" /></td>
<td>{'step1_host_info'|@translate}</td>
</tr>
<tr>
<td>{'step1_user'|@translate}</td>
<td align=center><input type="text" name="dbuser" value="{$F_DB_USER}" /></td>
<td>{'step1_user_info'|@translate}</td>
</tr>
<tr>
<td>{'step1_pass'|@translate}</td>
<td align=center><input type="password" name="dbpasswd" value="" /></td>
<td>{'step1_pass_info'|@translate}</td>
</tr>
<tr>
<td>{'step1_database'|@translate}</td>
<td align=center><input type="text" name="dbname" value="{$F_DB_NAME}" /></td>
<td>{'step1_database_info'|@translate}</td>
</tr>
<tr>
<td>{'step1_prefix'|@translate}</td>
<td align=center><input type="text" name="prefix" value="{$F_DB_PREFIX}" /></td>
<td>{'step1_prefix_info'|@translate}</td>
</tr>
</table>
<table class="table2">
<tr class="throw">
<th colspan="3">{'step2_title'|@translate}</th>
</tr>
<tr>
<td style="width: 30%;">{'install_webmaster'|@translate}</td>
<td align="center"><input type="text" name="admin_name" value="{$F_ADMIN}" /></td>
<td>{'install_webmaster_info'|@translate}</td>
</tr>
<tr>
<td>{'step2_pwd'|@translate}</td>
<td align="center"><input type="password" name="admin_pass1" value="" /></td>
<td>{'step2_pwd_info'|@translate}</td>
</tr>
<tr>
<td>{'step2_pwd_conf'|@translate}</td>
<td align="center"><input type="password" name="admin_pass2" value="" /></td>
<td>{'step2_pwd_conf_info'|@translate}</td>
</tr>
<tr>
<td>{'conf_mail_webmaster'|@translate}</td>
<td align="center"><input type="text" name="admin_mail" value="{$F_ADMIN_EMAIL}" /></td>
<td>{'conf_mail_webmaster_info'|@translate}</td>
</tr>
</table>
<table>
<tr>
<td style="text-align: center;">
<input class="submit" type="submit" name="install" value="{'Start_Install'|@translate}" />
</td>
</tr>
</table>
</form>
{/if}
</div> {* content *}
<div style="text-align: center">{$L_INSTALL_HELP}</div>
</body>
</html>
admin/template/goto/theme/roma/theme.css
+2 -2
View File
@@ -10,10 +10,10 @@ INPUT[type="submit"], INPUT[type="reset"] { color:#999; border: 1px solid #666;
input.rateButton, legend, h3 { color: #666; }
#theAdminPage h2 { color: #333; }
.content .infos { color: #f70; border:0; background-color: transparent;
padding:5px 0px 0pt 10pt; min-height: 48px; text-align:left; }
padding:5px 60px 0pt 10pt; min-height: 48px; text-align:left; }
.content .infos li, .content .errors li { list-style-type:none; }
.content .errors { color: #f30; border:0; background-color: transparent;
padding:5px 0px 0pt 10pt; min-height: 48px; text-align:left; font-weight:bold; }
padding:5px 60px 0pt 10pt; min-height: 48px; text-align:left; font-weight:bold; }
#copyright { color:#666; margin:60px auto 0px 240px; text-align:center;
padding-bottom: 15px; }
.header_notes { background: transparent url(../../icon/note.png) no-repeat right top;