Even some more HTML cleanups #2

diff --git a/templates/de/html/member/member_order-back.tpl b/templates/de/html/member/member_order-back.tpl
index 217da61561b20c4bb0a3b6b9d7b2bc1307d0d9d3..681b76e202f5d4ccee33c92f910b38208a602d2e 100644 (file)
--- a/templates/de/html/member/member_order-back.tpl
+++ b/templates/de/html/member/member_order-back.tpl
@@ -1,7 +1,7 @@
 <div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=order%}" method="posr">
 <div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=order%}" method="posr">

-       <div>
-               <strong><span class="member_done">{--MEMBER_THANX_ORDER--}</span></strong>
+       <div class="member_done">
+               {--MEMBER_THANX_ORDER--}

        </div>
        <div>
                <input type="submit" class="member_submit" value="{--MEMBER_CONTINUE_AREA--}" />
        </div>
        <div>
                <input type="submit" class="member_submit" value="{--MEMBER_CONTINUE_AREA--}" />

diff --git a/templates/de/html/member/member_order-html_ext.tpl b/templates/de/html/member/member_order-html_ext.tpl
index 10371f7e0694e4fdde42e6ed86788d2281964ba8..e875d96afebe985af20946b8ce09fd7c796f43c2 100644 (file)
--- a/templates/de/html/member/member_order-html_ext.tpl
+++ b/templates/de/html/member/member_order-html_ext.tpl
@@ -1,8 +1,6 @@
 <tr>
 <tr>

-       <td width="10" class="top bottom seperator">&nbsp;</td>
-       <td class="top bottom" colspan="3" align="center">
+       <td class="top bottom" colspan="2" align="center">

                <strong>{--MEMBER_HTML_VALID_TAGS--}:</strong><br />
                $content <input type="hidden" name="html" value="Y" />
        </td>
                <strong>{--MEMBER_HTML_VALID_TAGS--}:</strong><br />
                $content <input type="hidden" name="html" value="Y" />
        </td>

-       <td width="10" class="top bottom seperator">&nbsp;</td>

 </tr>
 </tr>

diff --git a/templates/de/html/member/member_order-html_intro.tpl b/templates/de/html/member/member_order-html_intro.tpl
index 6a876bf7aa37abcab462165d58347417ddca043f..e3575e2ecf752109f68c7953f7eda7a04e48da80 100644 (file)
--- a/templates/de/html/member/member_order-html_intro.tpl
+++ b/templates/de/html/member/member_order-html_intro.tpl
@@ -1,13 +1,15 @@
 <tr>
 <tr>

-       <td colspan="2" class="member_title2 bottom"
-               align="center"><strong>{--MEMBER_HTML_ORDER_INTRO--}</strong></td>
+       <td colspan="2" class="member_title2 bottom" align="center">
+               <strong>{--MEMBER_HTML_ORDER_INTRO--}</strong>
+       </td>

 </tr>
 <tr>
 </tr>
 <tr>

-       <td colspan="2" class="seperator" height="5">&nbsp;</td>
-</tr>
-<tr>
-       <td valign="top" height="20" align="right">{--MEMBER_HTML_MSG--}:&nbsp;<input
-               type="radio" name="html" class="member_normal" value="Y">&nbsp;&nbsp;</td>
-       <td valign="top">&nbsp;&nbsp;{--MEMBER_NORMAL_MSG--}:&nbsp;<input
-               type="radio" name="html" class="member_normal" value="N" checked="checked" /></td>
+       <td class="bottom" valign="top" align="center" height="20">
+               {--MEMBER_HTML_MSG--}:
+               <input type="radio" name="html" class="member_normal" value="Y" />
+       </td>
+       <td class="bottom" valign="top" align="center">
+               {--MEMBER_NORMAL_MSG--}:
+               <input type="radio" name="html" class="member_normal" value="N" checked="checked" />
+       </td>

 </tr>
 </tr>

diff --git a/templates/de/html/member/member_order-zip1.tpl b/templates/de/html/member/member_order-zip1.tpl
index 67efedaa69d9e04e25f9d85608821a07cc618278..095f9f258001c73f4bd0f1aefabd546492fc1f08 100644 (file)
--- a/templates/de/html/member/member_order-zip1.tpl
+++ b/templates/de/html/member/member_order-zip1.tpl
@@ -25,8 +25,8 @@
        </td>
 </tr>
 <tr>
        </td>
 </tr>
 <tr>

-       <td width="50%" align="right">{--MEMBER_ENTER_ZIP_CODE--}:</td>
-       <td width="50%">
+       <td class="bottom" width="50%" align="right">{--MEMBER_ENTER_ZIP_CODE--}:</td>
+       <td class="bottom" width="50%">

                <input type="text" name="zip" class="member_normal" size="5" maxlength="6" value="$content[zip]" />
        </td>
 </tr>
                <input type="text" name="zip" class="member_normal" size="5" maxlength="6" value="$content[zip]" />
        </td>
 </tr>

diff --git a/templates/de/html/member/member_order-zip2.tpl b/templates/de/html/member/member_order-zip2.tpl
index f55e068ef7a92b045098159898d2eec0b40f52fe..84ab8cf75d33067e67ff83fc0eb542729047fbd3 100644 (file)
--- a/templates/de/html/member/member_order-zip2.tpl
+++ b/templates/de/html/member/member_order-zip2.tpl
@@ -1,10 +1,10 @@
 <tr>
 <tr>

-       <td colspan="3" align="center" class="member_title2 bottom" height="30">
+       <td colspan="2" align="center" class="member_title2 bottom" height="30">

                <strong>{--MEMBER_ORDER_PAGE2_INTRO--}</strong>
        </td>
 </tr>
 <tr>
                <strong>{--MEMBER_ORDER_PAGE2_INTRO--}</strong>
        </td>
 </tr>
 <tr>

-       <td align="center" colspan="3">
+       <td class="bottom" align="center" colspan="2">

        <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
                <tr>
                        <td align="right">{--MEMBER_ENTER_ZIP_CODE--}</td>
        <table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">
                <tr>
                        <td align="right">{--MEMBER_ENTER_ZIP_CODE--}</td>

diff --git a/templates/de/html/member/member_order_back.tpl b/templates/de/html/member/member_order_back.tpl
index 259d9b36dced76f08e345e617f792c2fe4b8287f..45cf3eab3cba9291a79c68718d83f04453eab3fe 100644 (file)
--- a/templates/de/html/member/member_order_back.tpl
+++ b/templates/de/html/member/member_order_back.tpl
@@ -1,6 +1,8 @@
+<div align="center">

 <form accept-charset="utf-8" action="{?URL?}/modules.php" method="get" target="_parent">
        <input type="hidden" name="module" value="login" />
        <input type="hidden" name="what" value="order" />
        <input type="hidden" name="order" value="$content" />
        <input type="submit" class="member_reset" value="{--MEMBER_GO_BACK--}" />
 </form>
 <form accept-charset="utf-8" action="{?URL?}/modules.php" method="get" target="_parent">
        <input type="hidden" name="module" value="login" />
        <input type="hidden" name="what" value="order" />
        <input type="hidden" name="order" value="$content" />
        <input type="submit" class="member_reset" value="{--MEMBER_GO_BACK--}" />
 </form>

+</div>

diff --git a/templates/de/html/member/member_order_page1.tpl b/templates/de/html/member/member_order_page1.tpl
index 59b4572a57c5efa9f74858336dca1846d06a79ff..a07804ff5a5e192d247b340647f74ffe7aa78841 100644 (file)
--- a/templates/de/html/member/member_order_page1.tpl
+++ b/templates/de/html/member/member_order_page1.tpl
@@ -1,6 +1,6 @@
 <div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=order%}" method="post">
 <div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=order%}" method="post">

-<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed" align="center">
+<table border="0" cellspacing="0" cellpadding="0" class="member_table dashed">

        $content[zip_content]
        $content[html_extension]
        <tr>
        $content[zip_content]
        $content[html_extension]
        <tr>

diff --git a/templates/de/html/member/member_order_page2.tpl b/templates/de/html/member/member_order_page2.tpl
index 8f1c624220115ed340e89a7fbc45bfebc60d2ac6..30713e05459d5eb509c4e8cd399eb8b51680a97c 100644 (file)
--- a/templates/de/html/member/member_order_page2.tpl
+++ b/templates/de/html/member/member_order_page2.tpl
@@ -1,6 +1,6 @@
 <div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=order%}" method="post">
 <div align="center">
 <form accept-charset="utf-8" action="{%url=modules.php?module=login&amp;what=order%}" method="post">

-<table border="0" cellspacing="0" cellpadding="0" width="660" class="member_table dashed" align="center">
+<table border="0" cellspacing="0" cellpadding="0" width="660" class="member_table dashed">

        $content[zip_content]
        <tr>
                <td align="right">{--SELECT_MAIL_TYPE--}:</td>
        $content[zip_content]
        <tr>
                <td align="right">{--SELECT_MAIL_TYPE--}:</td>

diff --git a/templates/de/html/member/member_order_send.tpl b/templates/de/html/member/member_order_send.tpl
index fae55abed3847cc37fe1b72de051122ee6e61619..a33c205404be111631c9bc91c2d910038c473dbe 100644 (file)
--- a/templates/de/html/member/member_order_send.tpl
+++ b/templates/de/html/member/member_order_send.tpl
@@ -1,5 +1,11 @@
+<div align="center">

 <form accept-charset="utf-8" id="form" action="{%url=modules.php?module=order&amp;order=$content%}" method="post" target="_parent" onsubmit="return Submit()">
 <form accept-charset="utf-8" id="form" action="{%url=modules.php?module=order&amp;order=$content%}" method="post" target="_parent" onsubmit="return Submit()">

-{--MEMBER_ORDER_PLEASE_WAIT_1--}<span id="counter" style="font-weight:bold">10</span>{--MEMBER_ORDER_PLEASE_WAIT_2--}<br />
-<input type="submit" class="member_submit" id="ok" name="ok" value="{--MEMBER_DO_ORDER--}" />
+<div>
+       {--MEMBER_ORDER_PLEASE_WAIT_1--}<span id="counter" style="font-weight:bold">10</span>{--MEMBER_ORDER_PLEASE_WAIT_2--}
+</div>
+<div>
+       <input type="submit" class="member_submit" id="ok" name="ok" value="{--MEMBER_DO_ORDER--}" />
+</div>

 <script type="text/javascript" src="{%url=js.php?js=order_send%}{%ext,version=order%}"></script>
 </form>
 <script type="text/javascript" src="{%url=js.php?js=order_send%}{%ext,version=order%}"></script>
 </form>

+</div>