Merge branch 'master' of ssh://lx-office/~/lx-office-erp

[kivitendo-erp.git] / templates / webpages / admin / edit_user_de.html

diff --git a/templates/webpages/admin/edit_user_de.html b/templates/webpages/admin/edit_user_de.html
index be71f4f..7a8ada6 100644 (file)
--- a/templates/webpages/admin/edit_user_de.html
+++ b/templates/webpages/admin/edit_user_de.html
@@ -126,12 +126,10 @@
       <tr>
        <th align="right">Sprache</th>
        <td>
-        Deutsch
-        <input type="hidden" name="countrycode" value="de">
-<!--        <select name="countrycode">
+        <select name="countrycode">
          [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
          [% END %]
-        </select>-->
+        </select>
        </td>
       </tr>
 
@@ -176,7 +174,7 @@
        <td>
         <select name="menustyle">
          <option value="v3"[% IF menustyle_v3 %] selected[% END %]>Oben (mit CSS)</option>
-         <option value="v4"[% IF menustyle_v4 %] selected[% END %]>Top (CSS) new</option>
+         <option value="v4"[% IF menustyle_v4 %] selected[% END %]>Oben (mit CSS, neu)</option>
          <option value="neu"[% IF menustyle_neu %] selected[% END %]>Oben (mit Javascript)</option>
          <option value="xml"[% IF menustyle_xml %] selected[% END %]>Oben (XUL; nur f&uuml;r Mozilla Firefox)</option>
          <option value="old"[% IF menustyle_old %] selected[% END %]>Alt (seitlich)</option>
@@ -224,53 +222,11 @@
     </td>
    </tr>
 
-   <tr><td colspan="2"><hr size="3" noshade></td></tr>
-
-   <tr class="listheading">
-    <th colspan="2">WEBDAV-Zugriff</th>
-   </tr>
-
-   <tr>
-    <td colspan="2">
-     <table>
-      <tr>
-       <td>
-        <input name="angebote" id="angebote"class="checkbox" type="checkbox" value="1" [% IF myc_angebote %]checked[% END %]>
-        <label for="angebote">&nbsp;Angebot</label>
-       </td>
-       <td>
-        <input name="bestellungen" id="bestellungen" class="checkbox" type="checkbox" value="1" [% IF myc_bestellungen %]checked[% END %]>
-        <label for="bestellungen">&nbsp;Bestellung</label>
-       </td>
-       <td>
-        <input name="rechnungen" id="rechnungen" class="checkbox" type="checkbox" value="1" [% IF myc_rechnungen %]checked[% END %]>
-        <label for="rechnungen">&nbsp;Rechnung</label>
-       </td>
-      </tr>
-
-      <tr>
-       <td>
-        <input name="anfragen" id="anfragen" class="checkbox" type="checkbox" value="1" [% IF myc_anfragen %]checked[% END %]>
-        <label for="anfragen">&nbsp;Anfragen</label>
-       </td>
-       <td>
-        <input name="lieferantenbestellungen" id="lieferantenbestellungen" class="checkbox" type="checkbox" value="1" [% IF myc_lieferantenbestellungen %]checked[% END %]>
-        <label for="lieferantenbestellungen">&nbsp;Lieferantenbestellung</label>
-       </td>
-       <td>
-        <input name="einkaufsrechnungen" id="einkaufsrechnungen" class="checkbox" type="checkbox" value="1" [% IF myc_einkaufsrechnungen %]checked[% END %]>
-        <label for="einkaufsrechnungen">&nbsp;Einkaufsrechnung</label>
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-
    [% IF edit %]
    <tr><td colspan="2"><hr size="3" noshade></td></tr>
 
    <tr class="listheading">
-    <th colspan="2">Grouppenzugeh&ouml;rigkeit</th>
+    <th colspan="2">Gruppenzugehörigkeit</th>
    </tr>
 
    <tr>