Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 5cdf5329

Von Hans Peter Schlaepfer vor fast 6 Jahren hinzugefügt

  • ID 5cdf5329ee74157747f5e81d6279d202bf7d96a4
  • Vorgänger 0aa0a295
  • Nachfolger d2482a05

Neues kivitendo Design Aenderungen in SL/..

Unterschiede anzeigen:

SL/Controller/FinancialControllingReport.pm
49 49
  my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
50 50
  $self->{report} = $report;
51 51

  
52
  my @columns     = qw(customer globalprojectnumber globalproject_type transaction_description ordnumber net_amount delivered_amount delivered_amount_p billed_amount billed_amount_p paid_amount paid_amount_p
53
                       billable_amount billable_amount_p other_amount);
52
  my @columns     = qw(customer globalprojectnumber globalproject_type transaction_description ordnumber net_amount delivered_amount delivered_amount_p billed_amount billed_amount_p paid_amount paid_amount_p billable_amount billable_amount_p other_amount);
54 53
  my @sortable    = qw(ordnumber transdate customer globalprojectnumber globalproject_type transaction_description );
55 54
  $self->{number_columns} = [ qw(net_amount billed_amount billed_amount_p delivered_amount delivered_amount_p paid_amount paid_amount_p other_amount billable_amount billable_amount_p) ];
56 55

  
SL/Controller/RequirementSpecOrder.pm
192 192
  my ($self) = @_;
193 193

  
194 194
  $::auth->assert('requirement_spec_edit');
195
  $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu requirement_spec);
195
  $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu);
196 196
  $::request->{layout}->use_javascript("${_}.js")  for qw(jquery.jstree jquery/jquery.contextMenu client_js requirement_spec);
197 197

  
198 198
  return 1;
SL/Form.pm
422 422

  
423 423
  # standard css for all
424 424
  # this should gradually move to the layouts that need it
425
#  $layout->use_stylesheet("$_.css") for qw(
426
#    common main menu list_accounts jquery.autocomplete
427
#    jquery.multiselect2side
428
#    ui-lightness/jquery-ui
429
#    jquery-ui.custom
430
#    tooltipster themes/tooltipster-light
431
#  );
432
  # Use only style.css which is compiled from the less-files in /css/less/
425 433
  $layout->use_stylesheet("$_.css") for qw(
426
    common main menu list_accounts jquery.autocomplete
427
    jquery.multiselect2side
428
    ui-lightness/jquery-ui
429
    jquery-ui.custom
430
    tooltipster themes/tooltipster-light
434
    style
431 435
  );
432 436

  
437

  
433 438
  $layout->use_javascript("$_.js") for (qw(
434 439
    jquery jquery-ui jquery.cookie jquery.checkall jquery.download
435 440
    jquery/jquery.form jquery/fixes client_js
......
465 470

  
466 471
  # output
467 472
  print $self->create_http_response(content_type => 'text/html', charset => 'UTF-8');
468
  print $doctypes{$params{doctype} || 'transitional'}, $/;
473
  print $doctypes{$params{doctype} || 'html5'}, $/;
469 474
  print <<EOT;
470 475
<html>
471 476
 <head>
SL/Layout/CssMenu.pm
4 4
use parent qw(SL::Layout::Base);
5 5

  
6 6
sub use_stylesheet {
7
  qw(icons16.css),
7
  qw(style.css),
8 8
}
9 9

  
10 10
sub pre_content {
SL/Layout/Javascript.pm
69 69
    qw(
70 70
      dhtmlsuite/menu-item.css
71 71
      dhtmlsuite/menu-bar.css
72
      icons16.css
73
      menu.css
74 72
    ),
75 73
    ( map { $_->stylesheets } $_[0]->sub_layouts ),
76 74
    $_[0]->sub_layouts_by_name->{actionbar}->stylesheets,
SL/Layout/MenuLeft.pm
8 8
use URI;
9 9

  
10 10
sub stylesheets {
11
  qw(icons16.css icons24.css menu.css)
11
  #qw(icons16.css icons24.css menu.css) # no need for that with new design
12 12
}
13 13

  
14 14
sub javascripts_inline {
SL/Layout/None.pm
38 38
sub use_stylesheet {
39 39
  my $self = shift;
40 40
  qw(
41
    main.css
42
    menu.css
41
    style.css
43 42
  ),
44 43
  $self->SUPER::use_stylesheet(@_);
45 44
}
SL/Layout/Split.pm
18 18
  my $left  = join '', map { $_->pre_content } @{ $_[0]->left  || [] };
19 19
  my $right = join '', map { $_->pre_content } @{ $_[0]->right || [] };
20 20

  
21
  html_tag('div', $left, class => 'layout-split-left')
22
  .'<div class="layout-split-right">' . $right;
21
  html_tag('div', $left, id => 'layout-split-left')
22
  .'<div id="layout-split-right">' . $right;
23 23
}
24 24

  
25 25
sub post_content {
26 26
  my $left  = join '', map { $_->post_content } @{ $_[0]->left  || [] };
27 27
  my $right = join '', map { $_->post_content } @{ $_[0]->right || [] };
28 28

  
29
  $right . '</div>'
29
  $right . '</div><!-- /#layout-split-right -->'
30 30
  . html_tag('div', $left, class => 't-layout-left');
31 31
}
32 32

  
SL/Layout/Top.pm
22 22
  );
23 23
}
24 24

  
25
sub stylesheets {
26
 'frame_header/header.css';
27
}
25
# Only one CSS-File is used for standard design which are compiled from the LESS-Files in /css/less
26
#sub stylesheets {
27
# 'frame_header/header.css';
28
#}
28 29

  
29 30
sub javascripts {
30 31
  'jquery-ui.js',
SL/Presenter/Tag.pm
239 239

  
240 240
  _set_id_attribute(\%attributes, $attributes{name}) if $attributes{name};
241 241
  $attributes{type} ||= 'button';
242
  $attributes{tag}  ||= 'input';
242 243

  
243 244
  $onclick = 'if (!confirm("'. _J(delete($attributes{confirm})) .'")) return false; ' . $onclick if $attributes{confirm};
244 245

  
245
  html_tag('input', undef, %attributes, value => $value, onclick => $onclick);
246
  if ( $attributes{tag} == 'input' ) {
247
    html_tag('input', undef, %attributes, value => $value, onclick => $onclick);
248
  }
249
  elsif ( $attributes{tag} == 'button' ) {
250
    html_tag('button', undef, %attributes, value => $value, onclick => $onclick);
251
  }
246 252
}
247 253

  
248 254
sub submit_tag {
SL/Template/Plugin/L.pm
252 252
  my $minrows = delete $attributes{min_rows} || 1;
253 253
  my $maxrows = delete $attributes{max_rows};
254 254
  my $rows    = $::form->numtextrows($value, $cols, $maxrows, $minrows);
255
  my $class = $attributes{class}; # Do not delete attribute/hash element
255 256

  
256 257
  $attributes{id} ||= _tag_id();
257 258
  my $id            = $attributes{id};
258 259

  
259 260
  return $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols) if $rows > 1;
260

  
261
  return '<span>'
261
  # PENDENT: Hier sollte noch eine Klasse an kivi.switch_areainput_to_textarea uebergeben werden
262
  # PENDENT: ID gugusli aus button entfernen, wird nicht angezeigt im browser (war nur Test)
263
  return '<span class="switch-form-element">'
262 264
    . $self->input_tag($name, $value, %attributes, size => $cols)
263
    . "<img src=\"image/edit-entry.png\" onclick=\"kivi.switch_areainput_to_textarea('${id}')\" style=\"margin-left: 2px;\">"
265
    . "<button class=\"wi-tiny icon\"><img src=\"image/pencil.png\" onclick=\"kivi.switch_areainput_to_textarea('${id}','".$class."')\"></button>"
264 266
    . '</span>';
265 267
}
266 268

  

Auch abrufbar als: Unified diff