From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 27 Feb 2008 13:22:25 +0000 (+0000)
Subject: Warendialog umgestellt. Sollte jetzt ohne scrollen auf 1024x768 passen.
X-Git-Tag: release-2.6.0beta1~209
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=04e9a4746bd5f1de726ee00593286cbe48684417;p=kivitendo-erp.git

Warendialog umgestellt. Sollte jetzt ohne scrollen auf 1024x768 passen.
---

diff --git a/templates/webpages/ic/form_header_de.html b/templates/webpages/ic/form_header_de.html
index 32959ffa4..6c37d3f66 100644
--- a/templates/webpages/ic/form_header_de.html
+++ b/templates/webpages/ic/form_header_de.html
@@ -28,49 +28,47 @@
      <td>
       <table width="100%">
        <tr valign="top">
-        <th align="left">Artikelnummer</th>
-        <th align="left">Artikelbeschreibung</th>
-        [%- IF all_partsgroup.size %]
-        <th align="left">Warengruppe</th>
-        [% END %]
-       </tr>
-
-       <tr valign="top">
-        <td><input name="partnumber" value="[% HTML.escape(partnumber) %]" size="20"></td>
         <td>
-         [%- IF description_area %]
-         <textarea name="description" rows="[% HTML.escape(rows) %]" cols="40" wrap="soft">[% HTML.escape(description) %]</textarea>
-         [%- ELSE %]
-         <input name="description" size="40" value="[% HTML.escape(description) %]">
-         [%- END %]
-        </td>
-
-        [%- IF all_partsgroup.size %]
-        <td>
-         [%- INCLUDE generic/multibox.html
-         name       = 'selectpartsgroup',
-         DATA       = all_partsgroup,
-         show_empty = 1,
-         id_sub     = 'pg_keys',
-         label_key  = 'partsgroup',
-         -%]
-        </td>
-        [%- END %]
-        <input type="hidden" name="oldpartsgroup" value="[% HTML.escape(oldpartsgroup) %]">
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-    <tr>
-     <td>
-      <table width="100%" height="100%">
-       <tr valign="top">
-        <td width="70%">
-         <table width="100%" height="100%">
+         <table>
           <tr>
            <td colspan="2">
             <table>
+             <tr>
+              <th align="right">Artikelnummer</th>
+              <td><input name="partnumber" value="[% HTML.escape(partnumber) %]" size="40"></td>
+             </tr>
+             <tr>
+              <th align="right">Artikelbeschreibung</th>
+              <td>
+               [%- IF description_area %]
+               <textarea name="description" rows="[% HTML.escape(rows) %]" cols="40" wrap="soft">[% HTML.escape(description) %]</textarea>
+               [%- ELSE %]
+               <input name="description" size="40" value="[% HTML.escape(description) %]">
+               [%- END %]
+              </td>
+             </tr>
+             <tr>
+               <th align="right">EAN-Code</th>
+               <td><input name="ean" size="40" value="[% HTML.escape(ean) %]"></td>
+             </tr>
+             <tr>
+              [%- IF all_partsgroup.size %]
+              <th align="right">Warengruppe</th>
+              <td>
+               [%- INCLUDE generic/multibox.html
+                     name       = 'selectpartsgroup',
+                     DATA       = all_partsgroup,
+                     show_empty = 1,
+                     id_sub     = 'pg_keys',
+                     label_key  = 'partsgroup',
+                     style      = 'width:250px'
+               -%]
+              </td>
+              <input type="hidden" name="oldpartsgroup" value="[% HTML.escape(oldpartsgroup) %]">
+              [% END %]
+             </tr>
+
+
              [%- IF BUCHUNGSGRUPPEN.size %]
              <tr>
               <th align="right">Buchungsgruppe</th>
@@ -80,6 +78,7 @@
                      DATA       = BUCHUNGSGRUPPEN,
                      id_key     = 'id',
                      label_key  = 'description',
+                     style      = 'width:250px'
                -%]
              </tr>
              [%- END %]
@@ -90,59 +89,51 @@
              [%- IF is_part %]
              <input type="hidden" name="IC" value="[% HTML.escape(IC_default) %]">
              [%- END %]
+             <tr>
+              <th align="right">Zahlungskonditionen</th>
+              <td>
+               [%- INCLUDE generic/multibox.html
+                     name       = 'payment_id',
+                     DATA       = payment_terms,
+                     show_empty = 1,
+                     id_key     = 'id',
+                     label_key  = 'description',
+                     style      = 'width:250px'
+               -%]
+              </td>
+             </tr>
             </table>
            </td>
           </tr>
 
           <tr>
-           <th align="left">Bemerkungen</th>
-           [%- UNLESS is_service %]
-           <th align="left">Formel</th>
-           [%- END %]
-          </tr>
-
-          <tr>
-           <td>
-            <textarea name="notes" rows="[% HTML.escape(notes_rows) %]" cols="45" wrap="soft">[% HTML.escape(notes) %]</textarea>
-           </td>
-
-           [%- UNLESS is_service %]
            <td>
-            <ilayer>
-             <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname= Variable Einheit;<br>Variablenname2= Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Bitte achten Sie auf die Leerzeichen in der Formel<br>Es muss jeweils die Gesamte Zeile eingegeben werden')">
-              <textarea name="formel" rows="4" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
+            <button type="button" onclick="parts_language_selection_window('language_values')">Spracheinstellungen</button>
            </td>
-           [%- END %]
           </tr>
 
-          <tr>
-           <th align="left"></th>
-           <th align="left">EAN-Code</th>
-          </tr>
+          <tr height="5"></tr>
 
           <tr>
            <td>
-            <button type="button" onclick="parts_language_selection_window('language_values')">Spracheinstellungen</button>
-           </td>
-           <td>
-            <input name="ean" size="40" value="[% HTML.escape(ean) %]">
-           </td>
-          </tr>
-
-          <tr>
-           <td colspan="2">
             <table>
              <tr>
-              <th align="right">Zahlungskonditionen</th>
+              <th align="left">Bemerkungen</th>
+              [%- UNLESS is_service %]
+              <th align="left">Formel</th>
+              [%- END %]
+             </tr>
+             <tr>
               <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'payment_id',
-                     DATA       = payment_terms,
-                     show_empty = 1,
-                     id_key     = 'id',
-                     label_key  = 'description',
-               -%]
+               <textarea name="notes" rows="[% HTML.escape(notes_rows) %]" cols="45" wrap="soft">[% HTML.escape(notes) %]</textarea>
               </td>
+              [%- UNLESS is_service %]
+              <td>
+               <ilayer>
+                <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname= Variable Einheit;<br>Variablenname2= Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Bitte achten Sie auf die Leerzeichen in der Formel<br>Es muss jeweils die Gesamte Zeile eingegeben werden')">
+                 <textarea name="formel" rows="4" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
+               </td>
+              [%- END %]
              </tr>
             </table>
            </td>
@@ -150,11 +141,11 @@
          </table>
         </td>
 
-        <td width="30%">
-         <table width="100%">
+        <td>
+         <table>
           <tr>
            <th align="right" nowrap="true">Erneuert am</th>
-           <td width="13">
+           <td>
             <input name="priceupdate" id="priceupdate" size="11"  title="[% HTML.escape(dateformat) %]" value="[% HTML.escape(priceupdate) %]">
             <input type="button" name="priceupdate" id="trigger1" value="?">
            </td>
@@ -209,7 +200,7 @@
            </td>
           </tr>
 
-          [%- UNLESS is_service %]
+        [%- UNLESS is_service %]
           <tr>
            <th align="right" nowrap="true">Gewicht</th>
            <td>
@@ -217,54 +208,45 @@
             <input[% IF is_assembly %] type="hidden"[% END %] size="10" name="weight" value="[% LxERP.format_amount(weight) %]">
            </td>
           </tr>
-          [%- END %]
-
-          [%- UNLESS is_service %]
+        [%- END %]
+        [%- UNLESS is_service %]
           <tr>
            <th align="right" nowrap>Auf Lager</th>
            <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
           </tr>
-
           [%- IF is_assembly %]
           <tr>
            <th align="right" nowrap>Einlagern</th>
            <td><input name="stock" size="10" value="[% LxERP.format_amount(stock) %]"></td>
           </tr>
           [%- END %]
-
           <tr>
            <th align="right" nowrap="true">Mindestlagerbestand</th>
            <td><input name="rop" size="10" value="[% LxERP.format_amount(rop) %]"></td>
           </tr>
-
           <tr>
            <th align="right" nowrap="true">Lagerplatz</th>
            <td><input name="bin" size="10" value="[% HTML.escape(bin) %]"></td>
           </tr>
-
-          <tr>
-           <th align="right" nowrap><label for="not_discountable">Nicht rabattierfähig</label></th>
-           <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
-          </tr>
-
           <tr>
            <th align="right" nowrap="true">Verrechnungseinheit</th>
            <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>
           </tr>
-
           <tr>
            <th align="right" nowrap="true">Geschäftsvolumen</th>
            <td><input name="gv" size="10" value="[% LxERP.format_amount(gv) %]"></td>
           </tr>
-
-          [%- END %]
-          [%- IF id %]
+          <tr>
+           <th align="right" nowrap><label for="not_discountable">Nicht rabattierfähig</label></th>
+           <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
+          </tr>
+        [%- END %]
+        [%- IF id %]
           <tr>
            <th align="right" nowrap="true"><label for="obsolete">Ungültig</label></th>
            <td><input name="obsolete" id="obsolete" type="checkbox" class="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
           </tr>
-          [%- END %]
-
+        [%- END %]
           <tr>
            <th align="right" nowrap><label for="shop">Shopartikel</label></th>
            <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
@@ -276,10 +258,11 @@
      </td>
     </tr>
 
+
     [% UNLESS is_service %]
     <tr>
      <td>
-      <table width="100%">
+      <table>
        <tr>
         <th align="right" nowrap>Grafik</th>
         <td><input name="image" size="40" value="[% HTML.escape(image) %]"></td>
diff --git a/templates/webpages/ic/form_header_master.html b/templates/webpages/ic/form_header_master.html
index f6d13732a..113099b37 100644
--- a/templates/webpages/ic/form_header_master.html
+++ b/templates/webpages/ic/form_header_master.html
@@ -28,49 +28,47 @@
      <td>
       <table width="100%">
        <tr valign="top">
-        <th align="left"><translate>Part Number</translate></th>
-        <th align="left"><translate>Part Description</translate></th>
-        [%- IF all_partsgroup.size %]
-        <th align="left"><translate>Group</translate></th>
-        [% END %]
-       </tr>
-
-       <tr valign="top">
-        <td><input name="partnumber" value="[% HTML.escape(partnumber) %]" size="20"></td>
         <td>
-         [%- IF description_area %]
-         <textarea name="description" rows="[% HTML.escape(rows) %]" cols="40" wrap="soft">[% HTML.escape(description) %]</textarea>
-         [%- ELSE %]
-         <input name="description" size="40" value="[% HTML.escape(description) %]">
-         [%- END %]
-        </td>
-
-        [%- IF all_partsgroup.size %]
-        <td>
-         [%- INCLUDE generic/multibox.html
-         name       = 'selectpartsgroup',
-         DATA       = all_partsgroup,
-         show_empty = 1,
-         id_sub     = 'pg_keys',
-         label_key  = 'partsgroup',
-         -%]
-        </td>
-        [%- END %]
-        <input type="hidden" name="oldpartsgroup" value="[% HTML.escape(oldpartsgroup) %]">
-       </tr>
-      </table>
-     </td>
-    </tr>
-
-    <tr>
-     <td>
-      <table width="100%" height="100%">
-       <tr valign="top">
-        <td width="70%">
-         <table width="100%" height="100%">
+         <table>
           <tr>
            <td colspan="2">
             <table>
+             <tr>
+              <th align="right"><translate>Part Number</translate></th>
+              <td><input name="partnumber" value="[% HTML.escape(partnumber) %]" size="40"></td>
+             </tr>
+             <tr>
+              <th align="right"><translate>Part Description</translate></th>
+              <td>
+               [%- IF description_area %]
+               <textarea name="description" rows="[% HTML.escape(rows) %]" cols="40" wrap="soft">[% HTML.escape(description) %]</textarea>
+               [%- ELSE %]
+               <input name="description" size="40" value="[% HTML.escape(description) %]">
+               [%- END %]
+              </td>
+             </tr>
+             <tr>
+               <th align="right"><translate>EAN-Code</translate></th>
+               <td><input name="ean" size="40" value="[% HTML.escape(ean) %]"></td>
+             </tr>
+             <tr>
+              [%- IF all_partsgroup.size %]
+              <th align="right"><translate>Group</translate></th>
+              <td>
+               [%- INCLUDE generic/multibox.html
+                     name       = 'selectpartsgroup',
+                     DATA       = all_partsgroup,
+                     show_empty = 1,
+                     id_sub     = 'pg_keys',
+                     label_key  = 'partsgroup',
+                     style      = 'width:250px'
+               -%]
+              </td>
+              <input type="hidden" name="oldpartsgroup" value="[% HTML.escape(oldpartsgroup) %]">
+              [% END %]
+             </tr>
+
+
              [%- IF BUCHUNGSGRUPPEN.size %]
              <tr>
               <th align="right"><translate>Buchungsgruppe</translate></th>
@@ -80,6 +78,7 @@
                      DATA       = BUCHUNGSGRUPPEN,
                      id_key     = 'id',
                      label_key  = 'description',
+                     style      = 'width:250px'
                -%]
              </tr>
              [%- END %]
@@ -90,59 +89,51 @@
              [%- IF is_part %]
              <input type="hidden" name="IC" value="[% HTML.escape(IC_default) %]">
              [%- END %]
+             <tr>
+              <th align="right"><translate>Payment Terms</translate></th>
+              <td>
+               [%- INCLUDE generic/multibox.html
+                     name       = 'payment_id',
+                     DATA       = payment_terms,
+                     show_empty = 1,
+                     id_key     = 'id',
+                     label_key  = 'description',
+                     style      = 'width:250px'
+               -%]
+              </td>
+             </tr>
             </table>
            </td>
           </tr>
 
           <tr>
-           <th align="left"><translate>Notes</translate></th>
-           [%- UNLESS is_service %]
-           <th align="left"><translate>Formula</translate></th>
-           [%- END %]
-          </tr>
-
-          <tr>
-           <td>
-            <textarea name="notes" rows="[% HTML.escape(notes_rows) %]" cols="45" wrap="soft">[% HTML.escape(notes) %]</textarea>
-           </td>
-
-           [%- UNLESS is_service %]
            <td>
-            <ilayer>
-             <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('<translate>The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br></translate>')">
-              <textarea name="formel" rows="4" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
+            <button type="button" onclick="parts_language_selection_window('language_values')"><translate>Set Language Values</translate></button>
            </td>
-           [%- END %]
           </tr>
 
-          <tr>
-           <th align="left"></th>
-           <th align="left"><translate>EAN-Code</translate></th>
-          </tr>
+          <tr height="5"></tr>
 
           <tr>
            <td>
-            <button type="button" onclick="parts_language_selection_window('language_values')"><translate>Set Language Values</translate></button>
-           </td>
-           <td>
-            <input name="ean" size="40" value="[% HTML.escape(ean) %]">
-           </td>
-          </tr>
-
-          <tr>
-           <td colspan="2">
             <table>
              <tr>
-              <th align="right"><translate>Payment Terms</translate></th>
+              <th align="left"><translate>Notes</translate></th>
+              [%- UNLESS is_service %]
+              <th align="left"><translate>Formula</translate></th>
+              [%- END %]
+             </tr>
+             <tr>
               <td>
-               [%- INCLUDE generic/multibox.html
-                     name       = 'payment_id',
-                     DATA       = payment_terms,
-                     show_empty = 1,
-                     id_key     = 'id',
-                     label_key  = 'description',
-               -%]
+               <textarea name="notes" rows="[% HTML.escape(notes_rows) %]" cols="45" wrap="soft">[% HTML.escape(notes) %]</textarea>
               </td>
+              [%- UNLESS is_service %]
+              <td>
+               <ilayer>
+                <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('<translate>The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br></translate>')">
+                 <textarea name="formel" rows="4" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
+               </td>
+              [%- END %]
              </tr>
             </table>
            </td>
@@ -150,11 +141,11 @@
          </table>
         </td>
 
-        <td width="30%">
-         <table width="100%">
+        <td>
+         <table>
           <tr>
            <th align="right" nowrap="true"><translate>Updated</translate></th>
-           <td width="13">
+           <td>
             <input name="priceupdate" id="priceupdate" size="11"  title="[% HTML.escape(dateformat) %]" value="[% HTML.escape(priceupdate) %]">
             <input type="button" name="priceupdate" id="trigger1" value="?">
            </td>
@@ -209,7 +200,7 @@
            </td>
           </tr>
 
-          [%- UNLESS is_service %]
+        [%- UNLESS is_service %]
           <tr>
            <th align="right" nowrap="true"><translate>Weight</translate></th>
            <td>
@@ -217,54 +208,45 @@
             <input[% IF is_assembly %] type="hidden"[% END %] size="10" name="weight" value="[% LxERP.format_amount(weight) %]">
            </td>
           </tr>
-          [%- END %]
-
-          [%- UNLESS is_service %]
+        [%- END %]
+        [%- UNLESS is_service %]
           <tr>
            <th align="right" nowrap><translate>On Hand</translate></th>
            <th align="left" nowrap class="plus[% IF onhand > 0 %]1[% ELSE %]0[% END %]">&nbsp;[% LxERP.format_amount(onhand) %]</th>
           </tr>
-
           [%- IF is_assembly %]
           <tr>
            <th align="right" nowrap><translate>Stock</translate></th>
            <td><input name="stock" size="10" value="[% LxERP.format_amount(stock) %]"></td>
           </tr>
           [%- END %]
-
           <tr>
            <th align="right" nowrap="true"><translate>ROP</translate></th>
            <td><input name="rop" size="10" value="[% LxERP.format_amount(rop) %]"></td>
           </tr>
-
           <tr>
            <th align="right" nowrap="true"><translate>Bin</translate></th>
            <td><input name="bin" size="10" value="[% HTML.escape(bin) %]"></td>
           </tr>
-
-          <tr>
-           <th align="right" nowrap><label for="not_discountable"><translate>Not Discountable</translate></label></th>
-           <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
-          </tr>
-
           <tr>
            <th align="right" nowrap="true"><translate>Verrechnungseinheit</translate></th>
            <td><input name="ve" size="10" value="[% HTML.escape(ve) %]"></td>
           </tr>
-
           <tr>
            <th align="right" nowrap="true"><translate>Business Volume</translate></th>
            <td><input name="gv" size="10" value="[% LxERP.format_amount(gv) %]"></td>
           </tr>
-
-          [%- END %]
-          [%- IF id %]
+          <tr>
+           <th align="right" nowrap><label for="not_discountable"><translate>Not Discountable</translate></label></th>
+           <td><input class="checkbox" type="checkbox" name="not_discountable" id="not_discountable" value="1" [% IF not_discountable %]checked[% END %]></td>
+          </tr>
+        [%- END %]
+        [%- IF id %]
           <tr>
            <th align="right" nowrap="true"><label for="obsolete"><translate>Obsolete</translate></label></th>
            <td><input name="obsolete" id="obsolete" type="checkbox" class="checkbox" value="1" [% IF obsolete %]checked[% END %]></td>
           </tr>
-          [%- END %]
-
+        [%- END %]
           <tr>
            <th align="right" nowrap><label for="shop"><translate>Shopartikel</translate></label></th>
            <td><input class="checkbox" type="checkbox" name="shop" id="shop" value="1" [% IF shop %]checked[% END %]></td>
@@ -276,10 +258,11 @@
      </td>
     </tr>
 
+
     [% UNLESS is_service %]
     <tr>
      <td>
-      <table width="100%">
+      <table>
        <tr>
         <th align="right" nowrap><translate>Image</translate></th>
         <td><input name="image" size="40" value="[% HTML.escape(image) %]"></td>