Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 955f0913

Von Cem Aydin vor etwa 1 Jahr hinzugefügt

  • ID 955f0913ee1fbf6307b29766f080d76a3a25e614
  • Vorgänger b26018d8
  • Nachfolger 4d61649a

design40: dbupgrade Templates vereinheitlicht/bereinigt

- Formatierung vereinheitlicht
- wrapper Klasse hinzugefügt
- default_bin_parts.html, erzeugnisnummern.html: HTML Kommentare aus script tags entfernt, einrückung angepasst
- default_bin_parts.html: Syntax korrigiert/angepasst

Unterschiede anzeigen:

templates/design40_webpages/dbupgrade/acc_trans_constraints.html
1 1
[% USE T8 %]
2 2
[% USE L %]
3 3
[% USE HTML %]
4

  
4 5
<h1>[% 'Invalid transactions' | $T8 %]</h1>
5 6

  
7
<div class="wrapper">
8

  
6 9
<form name="Form" method="post" action="login.pl">
7 10
<input type="hidden" name="action" value="login">
8 11

  
......
88 91
<p><a href="http://www.kivitendo.de/partner.html" target="_blank">[% 'Here' | $T8 %]</a> [% 'you can find professional help.' | $T8 %]</p>
89 92

  
90 93
</form>
94

  
95
</div><!-- /.wrapper -->
templates/design40_webpages/dbupgrade/default_bin_parts.html
2 2
[% USE HTML %]
3 3
[% USE LxERP %]
4 4
[% USE JavaScript %]
5

  
5 6
<h1>[% '<b>Default Bins Migration !READ CAREFULLY!</b>' | $T8 %]</h1>
6 7

  
7
 <script type="text/javascript" src="js/common.js"></script>
8
 <script type="text/javascript">
9
  <!--
10
     warehouses = new Array();
11
     [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH warehouse = WAREHOUSES_it %]
12
      warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
13
      warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
14
      warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
15
      [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
16
      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
17
      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
18
      warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
19
      [% END %]
20
      [% END %]
21
      //var rowcount = [% rowcount %];
22
      //var rowcount = 3; //[% rowcount %];
23
      function warehouse_selected(warehouse_id, bin_id, loop) {
24
        var control = document.getElementById("bin_id_" + loop);
25

  
26
        for (var i = control.options.length - 1; i >= 0; i--) {
27
          control.options[i] = null;
28
        }
8
<script type="text/javascript" src="js/common.js"></script>
9
<script type="text/javascript">
10
  warehouses = new Array();
11
  [% USE WAREHOUSES_it = Iterator(WAREHOUSES) %][% FOREACH warehouse = WAREHOUSES_it %]
12
  warehouses[[% WAREHOUSES_it.count - 1 %]] = new Array();
13
  warehouses[[% WAREHOUSES_it.count - 1 %]]['id'] = [% warehouse.id %];
14
  warehouses[[% WAREHOUSES_it.count - 1 %]]['bins'] = new Array();
15
  [% USE BINS_it = Iterator(warehouse.BINS) %][% FOREACH bin = BINS_it %]
16
  warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]] = new Array();
17
  warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['description'] = "[% JavaScript.escape(bin.description) %]";
18
  warehouses[[% WAREHOUSES_it.count - 1%]]['bins'][[% BINS_it.count - 1 %]]['id'] = [% bin.id %];
19
  [% END %]
20
  [% END %]
21
  //var rowcount = [% rowcount %];
22
  //var rowcount = 3; //[% rowcount %];
23
  function warehouse_selected(warehouse_id, bin_id, loop) {
24
    var control = document.getElementById("bin_id_" + loop);
29 25

  
30
        var warehouse_index = 0;
26
    for (var i = control.options.length - 1; i >= 0; i--) {
27
      control.options[i] = null;
28
    }
31 29

  
32
        for (i = 0; i < warehouses.length; i++)
33
          if (warehouses[i]['id'] == warehouse_id) {
34
            warehouse_index = i;
35
            break;
36
          }
30
    var warehouse_index = 0;
37 31

  
38
        var warehouse = warehouses[warehouse_index];
39
        var bin_index = 0;
32
    for (i = 0; i < warehouses.length; i++)
33
      if (warehouses[i]['id'] == warehouse_id) {
34
        warehouse_index = i;
35
        break;
36
      }
40 37

  
41
        for (i = 0; i < warehouse['bins'].length; i++)
42
          if (warehouse['bins'][i]['id'] == bin_id) {
43
            bin_index = i;
44
            break;
45
          }
38
    var warehouse = warehouses[warehouse_index];
39
    var bin_index = 0;
46 40

  
47
        for (i = 0; i < warehouse['bins'].length; i++) {
48
          control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
49
        }
41
    for (i = 0; i < warehouse['bins'].length; i++)
42
      if (warehouse['bins'][i]['id'] == bin_id) {
43
        bin_index = i;
44
        break;
45
      }
50 46

  
47
    for (i = 0; i < warehouse['bins'].length; i++) {
48
      control.options[i] = new Option(warehouse['bins'][i]['description'], warehouse['bins'][i]['id']);
49
    }
51 50

  
52
        control.options[bin_index].selected = true;
53
      }
54 51

  
55
      function bin_match(rowcount) {
56
        for (i = 1; i <= rowcount + 1; i++) {              // über alle parts_id
57
          var lagerplatz = document.getElementById("bin_" + i).value;
58
          var control = document.getElementById("bin_id_" + i);
59
          var bin_index = 0;
60
          for (j = 0; j < warehouses.length; j++) {       // über alle lager
61
            var warehouse = warehouses[j];
62

  
63
            for (k = 0; k < warehouse['bins'].length; k++) {       // über alle lagerplätze
64

  
65
              if (lagerplatz == warehouse['bins'][k]['description']) {
66
                var lager = document.getElementById("warehouse_id_" + i);
67
                lager.selectedIndex = j;
68
                bin_index = k;
69
                for (bin_i = 0; bin_i < warehouse['bins'].length; bin_i++) {
70
                  control.options[bin_i] = new Option(warehouse['bins'][bin_i]['description'], warehouse['bins'][bin_i]['id']);
71
                }
72
                control.options[bin_index].selected = true;
73
                break;
74
                /*var lagerplatz = document.getElementById("bin_id_" + i);
75
                alert('lagerplatz ' + lagerplatz.value);
76
                lagerplatz.selectedIndex = k; */
77
              }
52
    control.options[bin_index].selected = true;
53
  }
54

  
55
  function bin_match(rowcount) {
56
    for (i = 1; i <= rowcount + 1; i++) {              // über alle parts_id
57
      var lagerplatz = document.getElementById("bin_" + i).value;
58
      var control = document.getElementById("bin_id_" + i);
59
      var bin_index = 0;
60
      for (j = 0; j < warehouses.length; j++) {       // über alle lager
61
        var warehouse = warehouses[j];
62

  
63
        for (k = 0; k < warehouse['bins'].length; k++) {       // über alle lagerplätze
78 64

  
65
          if (lagerplatz == warehouse['bins'][k]['description']) {
66
            var lager = document.getElementById("warehouse_id_" + i);
67
            lager.selectedIndex = j;
68
            bin_index = k;
69
            for (bin_i = 0; bin_i < warehouse['bins'].length; bin_i++) {
70
              control.options[bin_i] = new Option(warehouse['bins'][bin_i]['description'], warehouse['bins'][bin_i]['id']);
79 71
            }
72
            control.options[bin_index].selected = true;
73
            break;
74
            /*var lagerplatz = document.getElementById("bin_id_" + i);
75
            alert('lagerplatz ' + lagerplatz.value);
76
            lagerplatz.selectedIndex = k; */
80 77
          }
81
        }
82 78

  
79
        }
83 80
      }
81
    }
84 82

  
83
  }
85 84

  
86
      $(function() {
87
        warehouse_selected([% warehouse_id %], [% bin_id %]);
88
      })
89
    -->
90
 </script>
91 85

  
86
  $(function() {
87
    warehouse_selected([% warehouse_id %], [% bin_id %]);
88
  })
89
</script>
92 90

  
91
<div class="wrapper">
93 92

  
94 93
<form name="Form" method="post" action="login.pl">
95 94
  <input type="hidden" name="action" value="login">
......
128 127
        [% FOREACH warehouse = WAREHOUSES %]
129 128
          <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id==warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
130 129
        [% END %]
131
        <option value=""[% IF warehouse_id==0 %] selected[% END %]></option>
130
        <option value=""[% IF warehouse_id == 0 %] selected[% END %]></option>
132 131
        </select>
133 132
      </td>
134 133
      <td><select id="bin_id_[% loop.count %]" name="bin_id_[% loop.count %]"></select></td>
......
143 142
  <tbody>
144 143
    <tr>
145 144
      <th>[% '<b>Automatically create new bins</b> in the following warehouse if not selected in the list above' | $T8 %]</th>
146
      <td><<input type="checkbox" name="create_new_bins">/td>
145
      <td><input type="checkbox" name="create_new_bins">/td>
147 146
    </tr>
148 147
    <tr>
149 148
      <th>[% '<b>Automatically create new bins</b> in the following warehouse if not selected in the list above' | $T8 %]</th>
......
152 151
        [% FOREACH warehouse = WAREHOUSES %]
153 152
          <option value="[% HTML.escape(warehouse.id) %]"[% IF warehouse_id  == warehouse.id %] selected[% END %]>[% warehouse.description %]</option>
154 153
        [% END %]
155
        <option value=""[% IF warehouse_id  == 0 %] selected[% END %] ></option>
154
        <option value=""[% IF warehouse_id == 0 %] selected[% END %] ></option>
156 155
        </select>
157 156
      </td>
158 157
    </tr>
......
166 165
</div>
167 166

  
168 167
</form>
168

  
169
</div><!-- /.wrapper -->
templates/design40_webpages/dbupgrade/default_bin_parts_no_warehouse.html
1 1
[% USE T8 %]
2 2
[% USE HTML %]
3 3
[% USE LxERP %]
4

  
4 5
<h1>[% '<b>Default Bins Migration !READ CAREFULLY!</b>' | $T8 %]</h1>
5 6

  
7
<div class="wrapper">
8

  
6 9
<form name="Form" method="post" action="login.pl">
7 10
<input type="hidden" name="action" value="login">
8 11
<input type="hidden" name="continued" value="1">
......
67 70
</div>
68 71

  
69 72
</form>
73

  
74
</div><!-- /.wrapper -->
templates/design40_webpages/dbupgrade/erzeugnisnummern.html
1 1
[% USE T8 %]
2 2
[% USE HTML %]
3 3
[% USE LxERP %]
4

  
4 5
<h1>[% 'Double partnumbers' | $T8 %]</h1>
5 6

  
6 7
<script type="text/javascript">
7
<!--
8
function show_parts(vc) {
9
  var width = 750;
10
  var height = 550;
11
  var parm = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes";
12
  url = "controller.pl?action=LoginScreen/login&upgrade_action=filter_parts&no_layout=1"
13
  //alert(url);
14
  window.open(url, "_new_generic", parm);
15
}
16
//-->
8
  function show_parts(vc) {
9
    var width = 750;
10
    var height = 550;
11
    var parm = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes";
12
    url = "controller.pl?action=LoginScreen/login&upgrade_action=filter_parts&no_layout=1"
13
    //alert(url);
14
    window.open(url, "_new_generic", parm);
15
  }
17 16
</script>
18 17

  
18
<div class="wrapper">
19

  
19 20
<form name="Form" method="post" action="login.pl">
20 21
<input type="hidden" name="action" value="login">
21 22
<input type="hidden" name="continued" value="1">
......
59 60
<input type="submit" value="[% 'Continue' | $T8 %]">
60 61

  
61 62
</form>
63

  
64
</div><!-- /.wrapper -->
templates/design40_webpages/dbupgrade/no_default_currency.html
1 1
[% USE T8 %]
2 2
[% USE HTML %]
3

  
3 4
<h1>[% 'No default currency' | $T8 %]</h1>
4 5

  
6
<div class="wrapper">
7

  
5 8
<form name="Form" method="post" action="login.pl">
6 9
<input type="hidden" name="action" value="login">
7 10

  
......
15 18

  
16 19
</form>
17 20

  
21
</div><!-- /.wrapper -->
templates/design40_webpages/dbupgrade/orphaned_currencies.html
1
[%- USE T8 %]
2
[%- USE L %]
1
[% USE T8 %]
2
[% USE L %]
3 3
[% USE HTML %]
4

  
4 5
<h1>[% 'Orphaned currencies' | $T8 %]</h1>
5 6

  
7
<div class="wrapper">
8

  
6 9
<form name="Form" method="post" action="login.pl">
7 10
<input type="hidden" name="action" value="login">
8 11
<input type="hidden" name="defaultcurrency" value="[% HTML.escape(defaultcurrency) %]">
......
42 45

  
43 46
</form>
44 47

  
48
</div><!-- /.wrapper -->
templates/design40_webpages/dbupgrade/show_partlist.html
2 2
[% USE L %]
3 3
[% USE HTML %]
4 4
[% USE LxERP %]
5

  
5 6
<h1>[% 'Show parts' | $T8 %]</h1>
6 7

  
8
<div class="wrapper">
9

  
7 10
<form method="post" action="controller.pl">
8 11
  [% L.hidden_tag("action", "LoginScreen/login") %]
9 12
  [% L.hidden_tag("upgrade_action", "filter_parts") %]
......
86 89
</div>
87 90

  
88 91
</form>
92

  
93
</div><!-- /.wrapper -->
templates/design40_webpages/dbupgrade/steuerfilterung.html
1 1
[% USE T8 %]
2 2
[% USE HTML %]
3 3
[% USE L %]
4

  
4 5
<h1>[% 'New filter for tax accounts' | $T8 %]</h1>
5 6

  
7
<div class="wrapper">
8

  
6 9
<form name="Form" method="post" action="login.pl">
7 10
<input type="hidden" name="action" value="login">
8 11
<input type="hidden" name="continued_tax" value="1">
......
46 49
<input type="submit" value="[% 'Continue' | $T8 %]">
47 50

  
48 51
</form>
52

  
53
</div><!-- /.wrapper -->
templates/design40_webpages/dbupgrade/tax_constraints.html
1 1
[% USE T8 %]
2 2
[% USE HTML %]
3

  
3 4
<h1>[% 'Inconsistency in database' | $T8 %]</h1>
4 5

  
6
<div class="wrapper">
7

  
5 8
<form name="Form" method="post" action="login.pl">
6 9
<input type="hidden" name="action" value="login">
7 10

  
......
52 55

  
53 56
[% END %]
54 57
</form>
58

  
59
</div><!-- /.wrapper -->
templates/design40_webpages/dbupgrade/warehouse_form.html
1
[%- USE T8 %]
1
[% USE T8 %]
2 2
[% USE HTML %]
3

  
3 4
<h1>[% 'Warehouse Migration' | $T8 %]</h1>
4 5

  
6
<div class="wrapper">
7

  
5 8
<form action="[% script %]" method="POST">
6 9
 <p>
7 10
  [% 'kivitendo is now able to manage warehouses instead of just tracking the amount of goods in your system.' | $T8 %]
......
23 26

  
24 27
 <p><input type="submit" value="[% 'Continue' | $T8 %]"></p>
25 28
</form>
29

  
30
</div><!-- /.wrapper -->

Auch abrufbar als: Unified diff