Anyone here who is not in the raffle?
This commit is contained in:
parent
2af15a1dab
commit
4101e785dd
2 changed files with 60 additions and 40 deletions
|
@ -66,12 +66,12 @@ body {
|
|||
}
|
||||
|
||||
.subtitle {
|
||||
font-size: 1.5em;
|
||||
font-size: 1.3em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.item {
|
||||
font-size: 11px;
|
||||
font-size: 1em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
|
@ -81,7 +81,8 @@ body {
|
|||
.budget-subtotal {
|
||||
font-family: monospace;
|
||||
font-size: 1.2em;
|
||||
margin-bottom: 10px;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
display: table-row;
|
||||
}
|
||||
|
||||
|
|
|
@ -932,16 +932,9 @@ END
|
|||
$display_runningex =~ s/(\d)(?=(\d{3})+(\D|$))/$1\,/g; ## add commma
|
||||
$display_surplus = sprintf "%.2f",$surplus;
|
||||
$display_surplus =~ s/(\d)(?=(\d{3})+(\D|$))/$1\,/g; ## add commma
|
||||
print <<END;
|
||||
<div class="budget-subtotal">
|
||||
<p class="subtotal-name">RUNNING total OUT:</p>
|
||||
<p class="subtotal-amount">€$display_runningex</p>
|
||||
</div>
|
||||
<div class="budget-subtotal">
|
||||
<p class="subtotal-name">BALANCE OF FINANCIAL TRADE:</p>
|
||||
<p class="subtotal-amount">€$display_surplus</p>
|
||||
</div>
|
||||
END
|
||||
|
||||
print_subtotal("RUNNING total OUT:","€$display_runningex");
|
||||
print_subtotal("BALANCE OF FINANCIAL TRADE:"," €$display_surplus");
|
||||
}
|
||||
|
||||
print <<END;
|
||||
|
@ -949,10 +942,10 @@ END
|
|||
<div id="right" class="column">
|
||||
|
||||
<div class="title">NONFINANCIAL</div>
|
||||
<div class="subtitle">Human and nonhuman budget contributions: / labour and resources, deployed &/or offfered, latent, awaiting activation</div>
|
||||
|
||||
END
|
||||
|
||||
print_subtitle("Human and nonhuman budget contributions: / labour and resources, deployed &/or offfered, latent, awaiting activation");
|
||||
|
||||
print_subtitle("Labour / deployed");
|
||||
|
||||
$sthdl->execute;
|
||||
|
@ -968,7 +961,7 @@ END
|
|||
print_item("$record->{item} [$first_init$last_init]");
|
||||
}
|
||||
|
||||
print_subsection("Resources / deployed");
|
||||
print_subtitle("Resources / deployed");
|
||||
|
||||
while (my $record = $sthdr->fetchrow_hashref) {
|
||||
$record->{item} =~ s/^([a-z])/\U$1/; ## capitalise first letter
|
||||
|
@ -1019,24 +1012,6 @@ END
|
|||
}
|
||||
|
||||
|
||||
sub print_subtitle {
|
||||
my $string = shift;
|
||||
print <<END;
|
||||
<div class="subtitle">$string</p></div>
|
||||
END
|
||||
}
|
||||
|
||||
sub print_item {
|
||||
my $string = shift;
|
||||
my $amount = shift;
|
||||
if (not $amount) {$amount = "";}
|
||||
print <<END;
|
||||
<div class="budget-item">
|
||||
<p class="item-name">$string</p>
|
||||
<p class="item-amount">$amount</p>
|
||||
</div>
|
||||
END
|
||||
}
|
||||
|
||||
############################################################################
|
||||
# prepare expenditure
|
||||
|
@ -1932,8 +1907,53 @@ sub select_start_date {
|
|||
print(qq(</select></td></tr>\n));
|
||||
}
|
||||
|
||||
###############################################################################
|
||||
# print the page header
|
||||
|
||||
##############################################################################
|
||||
# #
|
||||
# printing and formatting #
|
||||
# #
|
||||
##############################################################################
|
||||
|
||||
|
||||
## print a subtitle
|
||||
|
||||
sub print_subtitle {
|
||||
my $string = shift;
|
||||
print <<END;
|
||||
<div class="subtitle">$string</p></div>
|
||||
END
|
||||
}
|
||||
|
||||
## print a budget subtotal
|
||||
|
||||
sub print_subtotal {
|
||||
my $string = shift;
|
||||
my $amount = shift;
|
||||
if (not $amount) {$amount = "";}
|
||||
print <<END;
|
||||
<div class="budget-subtotal">
|
||||
<p class="subtotal-name">$string</p>
|
||||
<p class="subtotal-amount">$amount</p>
|
||||
</div>
|
||||
END
|
||||
}
|
||||
|
||||
## print standard budget item
|
||||
|
||||
sub print_item {
|
||||
my $string = shift;
|
||||
my $amount = shift;
|
||||
if (not $amount) {$amount = "";}
|
||||
print <<END;
|
||||
<div class="budget-item">
|
||||
<p class="item-name">$string</p>
|
||||
<p class="item-amount">$amount</p>
|
||||
</div>
|
||||
END
|
||||
}
|
||||
|
||||
|
||||
## print the page header
|
||||
|
||||
sub print_header {
|
||||
print <<END;
|
||||
|
@ -1953,8 +1973,7 @@ END
|
|||
}
|
||||
|
||||
|
||||
###############################################################################
|
||||
# print the standard footer
|
||||
## print the standard footer
|
||||
|
||||
sub print_footer {
|
||||
print <<END;
|
||||
|
@ -1963,8 +1982,8 @@ sub print_footer {
|
|||
END
|
||||
}
|
||||
|
||||
###############################################################################
|
||||
# print the admin footer
|
||||
|
||||
## print the admin footer
|
||||
|
||||
sub adminfooter {
|
||||
|
||||
|
|
Loading…
Reference in a new issue