Added missing 'extension' initialization in installer and used EL code there + fixed...

[mailer.git] / templates / de / html / install / install_page2.tpl

diff --git a/templates/de/html/install/install_page2.tpl b/templates/de/html/install/install_page2.tpl
index 9ca1743d558c693e77f64b053e57964114f77718..fdf5c253d6e227ff8a4503adc1fdb66c445e8df3 100644 (file)
--- a/templates/de/html/install/install_page2.tpl
+++ b/templates/de/html/install/install_page2.tpl
@@ -1,61 +1,80 @@
-<div align="center">
-<form accept-charset="utf-8" action="{?URL?}/install.php?page=3" method="post" target="_self">
-<table border="0" cellspacing="0" cellpadding="0" class="install_table">
+<div align="center" style="margin-bottom:10px">
+{%form,formMethodPost,formTarget_self=install.php?install_page=3%}
+<table border="0" cellspacing="0" cellpadding="0" class="install_content">
        <tr>
                <td colspan="2" align="center" class="install_title">
-                       <div class="install_welcome">{--HEADER_TEXT_PAGE2--}</div>
+                       {--INSTALLER_PAGE_DATABASE_CONFIG_TITLE--}
                </td>
        </tr>
+
        <tr>
                <td colspan="2">
-                       <span class="install_text">{--TEXT_PAGE_2--}</span>
+                       {--INSTALLER_DATABASE_CONFIG_DESCRIPTION--}
                </td>
        </tr>
+
        <tr>
-               <td align="right" class="install_right">{--MYSQL_HOST--}:</td>
+               <td align="right" class="install_right">{--INSTALLER_MYSQL_HOST--}</td>
                <td align="left">
-                       <input type="text" name="mysql[host]" size="25" value="$content[mysql_host]" class="install_normal" />
+                       <input type="text" class="form_field" name="mysql[host]" size="25" value="$content[mysql_host]" />
                </td>
        </tr>
+
        <tr>
-               <td align="right" class="install_right">{--MYSQL_DBASE--}:</td>
+               <td align="right" class="install_right">{--INSTALLER_MYSQL_DBASE--}</td>
                <td align="left">
-                       <input type="text" name="mysql[dbase]" size="25" value="$content[mysql_dbase]" class="install_normal" />
+                       <input type="text" class="form_field" name="mysql[dbase]" size="25" value="$content[mysql_dbase]" />
                </td>
        </tr>
+
        <tr>
-               <td align="right" class="install_right">{--MYSQL_PREFIX--}:</td>
+               <td align="right" class="install_right">{--INSTALLER_MYSQL_PREFIX--}</td>
                <td align="left">
-                       <input type="text" name="mysql[prefix]" size="25" value="$content[mysql_prefix]" class="install_normal" />
+                       <input type="text" class="form_field" name="mysql[prefix]" size="25" value="$content[mysql_prefix]" />
                </td>
        </tr>
+
        <tr>
-               <td align="right" class="install_right">{--MYSQL_TABLE_TYPE--}:</td>
+               <td align="right" class="install_right">{--INSTALLER_MYSQL_ENGINE--}</td>
                <td align="left">
                        <select name="mysql[type]" size="1">
-                               <option value="MyISAM">{--TABLE_TYPE_MYISAM--}</option>
-                               <option value="InnoDB">{--TABLE_TYPE_INNODB--}</option>
+                               <option value="MyISAM">{--INSTALLER_TABLE_TYPE_MYISAM--}</option>
+                               <option value="InnoDB">{--INSTALLER_TABLE_TYPE_INNODB--}</option>
                        </select>
                </td>
        </tr>
+
        <tr>
-               <td align="right" class="install_right">{--MYSQL_LOGIN--}:</td>
+               <td align="right" class="install_right">{--INSTALLER_DATABASE_EXTENSION--}</td>
                <td align="left">
-                       <input type="text" name="mysql[login]" size="25" value="$content[mysql_login]" class="install_normal" />
+                       <select name="mysql[extension]" size="1">
+                               <option value="mysql">{%pipe,translatePhpExtension=mysql%}</option>
+                               <option value="mysqli" selected="selected">{%pipe,translatePhpExtension=mysqli%}</option>
+                       </select>
+               </td>
+       </tr>
+
+       <tr>
+               <td align="right" class="install_right">{--INSTALLER_MYSQL_LOGIN--}</td>
+               <td align="left">
+                       <input type="text" class="form_field" name="mysql[login]" size="25" value="$content[mysql_login]" />
                </td>
        </tr>
+
        <tr>
-               <td align="right" class="install_right">{--MYSQL_PASS1--}:</td>
+               <td align="right" class="install_right">{--INSTALLER_MYSQL_PASSWORD1--}</td>
                <td align="left">
-                       <input type="password" name="mysql[pass1]" size="25" class="install_normal" />
+                       <input type="password" class="form_field" name="mysql[password1]" size="25" />
                </td>
        </tr>
+
        <tr>
-               <td align="right" class="install_right">{--MYSQL_PASS2--}:</td>
+               <td align="right" class="install_right">{--INSTALLER_MYSQL_PASSWORD2--}</td>
                <td align="left">
-                       <input type="password" name="mysql[pass2]" size="25" class="install_normal" />
+                       <input type="password" class="form_field" name="mysql[password2]" size="25" />
                </td>
        </tr>
+
        <tr>
                <td colspan="2" align="center" class="install_footer">
                        <input type="hidden" name="spath" value="$content[spath]" />
@@ -63,9 +82,9 @@
                        <input type="hidden" name="title" value="$content[title]" />
                        <input type="hidden" name="slogan" value="$content[slogan]" />
                        <input type="hidden" name="email" value="$content[email]" />
-                       <input type="submit" class="admin_submit" value="{--NEXT_PAGE--}" />
+                       <input type="submit" class="form_submit" name="next_page" value="{--INSTALLER_NEXT_PAGE--}" />
                </td>
        </tr>
 </table>
-</form>
-</div>
\ No newline at end of file
+{%form_close%}
+</div>