Further fixes for installation phase and endless loop

[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 6aeabef076dee6d165b150285390bd08342cc45e..4a2bdbb7026185071de8cb9ada1d8fc984cac75c 100644 (file)
--- a/templates/de/html/install/install_page2.tpl
+++ b/templates/de/html/install/install_page2.tpl
@@ -1,48 +1,50 @@
-<form action="{!__BURL_ACTION--}/install.php?page=3" method="POST"
-       target="_self">
+<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">
        <tr>
                <td colspan="2" align="center">
-                       <div class="install">{--HEADER_TEXT_PAGE2--}</div>
+                       <div class="install_welcome">{--HEADER_TEXT_PAGE2--}</div>
                </td>
        </tr>
        <tr>
                <td colspan="2" height="21" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="2"><span class="install_intro">
+               <td colspan="2"><span class="install_text">
                {--TEXT_PAGE_2--} </span></td>
        </tr>
        <tr>
                <td colspan="2" height="21" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--MYSQL_HOST--}&nbsp;:&nbsp;</td>
-               <td width="50%"><input type="text" name="mysql[host]" size="25"
-                       value="{!__MYSQL_HOST--}" class="install_normal"></td>
+               <td width="50%" align="right" class="install_right">{--MYSQL_HOST--}:</td>
+               <td width="50%" align="left">
+                       <input type="text" name="mysql[host]" size="25" value="$content[mysql_host]" class="install_normal" />
+               </td>
        </tr>
        <tr>
                <td colspan="2" height="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--MYSQL_DBASE--}&nbsp;:&nbsp;</td>
-               <td width="50%"><input type="text" name="mysql[dbase]" size="25"
-                       value="{!__MYSQL_DBASE--}" class="install_normal"></td>
+               <td width="50%" align="right" class="install_right">{--MYSQL_DBASE--}:</td>
+               <td width="50%" align="left">
+                       <input type="text" name="mysql[dbase]" size="25" value="$content[mysql_dbase]" class="install_normal" />
+               </td>
        </tr>
        <tr>
                <td colspan="2" height="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--MYSQL_PREFIX--}&nbsp;:&nbsp;</td>
-               <td width="50%"><input type="text" name="mysql[prefix]" size="25"
-                       value="{!__MYSQL_PREFIX--}" class="install_normal"></td>
+               <td width="50%" align="right" class="install_right">{--MYSQL_PREFIX--}:</td>
+               <td width="50%" align="left">
+                       <input type="text" name="mysql[prefix]" size="25" value="$content[mysql_prefix]" class="install_normal" />
+               </td>
        </tr>
        <tr>
                <td colspan="2" height="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--MYSQL_TABLE_TYPE--}&nbsp;:&nbsp;</td>
-               <td width="50%">
+               <td width="50%" align="right" class="install_right">{--MYSQL_TABLE_TYPE--}:</td>
+               <td width="50%" align="left">
                        <select name="mysql[type]" size="1">
                                <option value="MyISAM">{--TABLE_TYPE_MYISAM--}</option>
                                <option value="InnoDB">{--TABLE_TYPE_INNODB--}</option>
@@ -53,38 +55,41 @@
                <td colspan="2" height="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--MYSQL_LOGIN--}&nbsp;:&nbsp;</td>
-               <td width="50%"><input type="text" name="mysql[login]" size="25"
-                       value="{!__MYSQL_LOGIN--}" class="install_normal"></td>
+               <td width="50%" align="right" class="install_right">{--MYSQL_LOGIN--}:</td>
+               <td width="50%" align="left">
+                       <input type="text" name="mysql[login]" size="25" value="$content[mysql_login]" class="install_normal" />
+               </td>
        </tr>
        <tr>
                <td colspan="2" height="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--MYSQL_PASS1--}&nbsp;:&nbsp;</td>
-               <td width="50%"><input type="password" name="mysql[pass1]"
-                       size="25" class="install_normal" class="install_normal"></td>
+               <td width="50%" align="right" class="install_right">{--MYSQL_PASS1--}:</td>
+               <td width="50%" align="left">
+                       <input type="password" name="mysql[pass1]" size="25" class="install_normal" />
+               </td>
        </tr>
        <tr>
                <td colspan="2" height="10" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td width="50%" align="right" class="install">{--MYSQL_PASS2--}&nbsp;:&nbsp;</td>
-               <td width="50%"><input type="password" name="mysql[pass2]"
-                       size="25" class="install_normal" class="install_normal"></td>
+               <td width="50%" align="right" class="install_right">{--MYSQL_PASS2--}:</td>
+               <td width="50%" align="left">
+                       <input type="password" name="mysql[pass2]" size="25" class="install_normal" />
+               </td>
        </tr>
        <tr>
                <td colspan="2" height="21" class="seperator">&nbsp;</td>
        </tr>
        <tr>
-               <td colspan="2" align="center"><input type="hidden" name="spath"
-                       value="{!__SPATH_VALUE!}"> <input type="hidden" name="burl"
-                       value="{!__BURL_VALUE!}"> <input type="hidden" name="title"
-                       value="{!__TITLE_VALUE!}"> <input type="hidden"
-                       name="slogan" value="{!__SLOGAN_VALUE!}"> <input
-                       type="hidden" name="email" value="{!__EMAIL_VALUE!}"> <input
-                       type="submit" class="admin_submit submit" value="{--NEXT_PAGE--}"
-                       class="install_submit"></td>
+               <td colspan="2" align="center">
+                       <input type="hidden" name="spath" value="$content[spath]" />
+                       <input type="hidden" name="burl" value="$content[burl]" />
+                       <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 submit" value="{--NEXT_PAGE--}" />
+               </td>
        </tr>
        <tr>
                <td colspan="2" height="21" class="seperator">&nbsp;</td>