Use filter instead of having to stash the function everywhere

diff --git a/lib/NDWeb/Controller/Alliances.pm b/lib/NDWeb/Controller/Alliances.pm
index 833143aaab2364738f79fc9564d47e0339cbc930..c2d40fffb4f81518fde43e6c01c236c826d66fe3 100644 (file)
--- a/lib/NDWeb/Controller/Alliances.pm
+++ b/lib/NDWeb/Controller/Alliances.pm
@@ -62,7 +62,6 @@ sub list : Local {
                } . $order);
        $query->execute;
        $c->stash(alliances => $query->fetchall_arrayref({}) );
-       $c->stash(comma => \&comma_value);
 }
 
 sub edit : Local {
@@ -253,7 +252,6 @@ LIMIT 60) a
                push @alliances,$alliance;
        }
        $c->stash(alliances => \@alliances);
-       $c->stash( comma => \&comma_value)
 }
 
 

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index 440c51f47021a778f690c3e5a1400b6c23fc83e8..f6cbefdd91473476487c054d9290f2d4456782e2 100644 (file)
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -29,7 +29,6 @@ sub index : Path : Args(0) {
 
        $c->stash(error => $c->flash->{error});
 
-       $c->stash(comma => \&comma_value);
        $c->stash(u => $dbh->selectrow_hashref(q{SELECT planet,defense_points
                        ,attack_points,scan_points,humor_points
                        , (attack_points+defense_points+scan_points/20)::NUMERIC(5,1) as total_points

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index ab1adb5e26737f1581c65212a22cdac255b08aaa..6b4f16c3081a96527a4c89284af2035ed2ea5f16 100644 (file)
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -107,8 +107,6 @@ sub view : Local {
        $c->forward('findRaid');
        $raid = $c->stash->{raid};
 
-       $c->stash(comma => \&comma_value);
-
        $c->stash(raid => $raid->{id});
        my $planet;
        if ($c->user->planet){
@@ -548,7 +546,6 @@ sub targetlist : Local {
        my ($self, $c, $alliances, $order) = @_;
        my $dbh = $c->model;
 
-       $c->stash(comma => \&comma_value);
        $c->stash(allies => $alliances);
        $alliances ||= '';
        my @alliances = split /,/, $alliances;

diff --git a/lib/NDWeb/Controller/Rankings.pm b/lib/NDWeb/Controller/Rankings.pm
index 1575d4e0d574642ed760c0bebc65d5870e350cc4..b34792b74b115876d26d79c98d36eef4bb92fd46 100644 (file)
--- a/lib/NDWeb/Controller/Rankings.pm
+++ b/lib/NDWeb/Controller/Rankings.pm
@@ -39,8 +39,6 @@ sub planets : Local {
        $c->detach('/default') if $offset < 0;
        $c->stash(offset => $offset);
 
-       $c->stash( comma => \&comma_value);
-
        if (defined $order && $order =~ /^(scorerank|sizerank|valuerank|xprank|hit_us)$/){
                $order = $1;
        }else {
@@ -89,8 +87,6 @@ sub galaxies : Local {
        $c->detach('/default') if $offset < 0;
        $c->stash(offset => $offset);
 
-       $c->stash( comma => \&comma_value);
-
        if (defined $order && $order =~ /^(scorerank|sizerank|valuerank|xprank|planets)$/){
                $order = $1;
        }else{
@@ -136,8 +132,6 @@ sub alliances : Local {
        $c->detach('/default') if $offset < 0;
        $c->stash(offset => $offset);
 
-       $c->stash( comma => \&comma_value);
-
        if (defined $order && $order =~ /^(scorerank|sizerank|valuerank|xprank|avgsize|avgscore|members)$/){
                $order = $1;
        }else{

diff --git a/lib/NDWeb/Controller/Stats.pm b/lib/NDWeb/Controller/Stats.pm
index 3ad7906eb6e14736a5f211dde6431b9109a045cd..b25784028bc50d9496be36aaf52dc9a93402b070 100644 (file)
--- a/lib/NDWeb/Controller/Stats.pm
+++ b/lib/NDWeb/Controller/Stats.pm
@@ -33,8 +33,6 @@ sub galaxy : Local {
        my ( $self, $c, $x, $y, $z ) = @_;
        my $dbh = $c->model;
 
-       $c->stash( comma => \&comma_value);
-
        my $query = $dbh->prepare(q{SELECT x,y,
                size, size_gain, size_gain_day,
                score,score_gain,score_gain_day,

diff --git a/lib/NDWeb/View/TT.pm b/lib/NDWeb/View/TT.pm
index b0f85713f1d4e164c066f9d1b32af65f88f5e6e6..ac28c3fd1f8a55bc717e42fee0406dc7c8bace26 100644 (file)
--- a/lib/NDWeb/View/TT.pm
+++ b/lib/NDWeb/View/TT.pm
@@ -3,11 +3,16 @@ package NDWeb::View::TT;
 use strict;
 use base 'Catalyst::View::TT';
 
+use NDWeb::Include;
+
 __PACKAGE__->config({
        INCLUDE_PATH => [
                NDWeb->path_to( 'root', 'src' ),
                NDWeb->path_to( 'root', 'lib' )
        ],
+       FILTERS => {
+               commify => \&comma_value,
+       },
        PRE_PROCESS  => 'config/main.tt2',
        WRAPPER      => 'site/wrapper.tt2',
        ERROR        => 'error.tt2',

diff --git a/root/lib/inc/stats.tt2 b/root/lib/inc/stats.tt2
index 6ff6e0b2e8951e334648337e5b701e02a050c3c7..29223ec35e33f55f8119466f013283bdd2da83bd 100644 (file)
--- a/root/lib/inc/stats.tt2
+++ b/root/lib/inc/stats.tt2
@@ -27,15 +27,15 @@
                <td title="[% g.xprank_gain_day %] Today | [% g.xprank_gain %] Tick">[% g.xprank %] <img src="/static/images/[% g.xprankimg %].png" alt="[% g.xprankimg %]"> </td>
                <td><a href="[% c.uri_for('/stats','galaxy',g.x,g.y) %]">[% g.x %]:[% g.y %]</a></td>
                [% g.planetsimg = (g.planets_gain_day == 0 ? 'stay' : (g.planets_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% g.planets_gain_day %] Today | [% g.planets_gain %] Tick">[% comma(g.planets) %] <img src="/static/images/[% g.planetsimg %].png" alt="[% g.planetsimg %]"> </td>
+               <td title="[% g.planets_gain_day %] Today | [% g.planets_gain %] Tick">[% g.planets | commify %] <img src="/static/images/[% g.planetsimg %].png" alt="[% g.planetsimg %]"> </td>
                [% g.sizeimg = (g.size_gain_day == 0 ? 'stay' : (g.size_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% g.size_gain_day %] Today | [% g.size_gain %] Tick">[% comma(g.size) %] <img src="/static/images/[% g.sizeimg %].png" alt="[% g.sizeimg %]"> </td>
+               <td title="[% g.size_gain_day %] Today | [% g.size_gain %] Tick">[% g.size | commify %] <img src="/static/images/[% g.sizeimg %].png" alt="[% g.sizeimg %]"> </td>
                [% g.scoreimg = (g.score_gain_day == 0 ? 'stay' : (g.score_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(g.score_gain_day) %] Today | [% comma(g.score_gain) %] Tick">[% comma(g.score) %] <img src="/static/images/[% g.scoreimg %].png" alt="[% g.scoreimg %]"> </td>
+               <td title="[% g.score_gain_day | commify %] Today | [% g.score_gain | commify %] Tick">[% g.score | commify %] <img src="/static/images/[% g.scoreimg %].png" alt="[% g.scoreimg %]"> </td>
                [% g.valueimg = (g.value_gain_day == 0 ? 'stay' : (g.value_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(g.value_gain_day) %] Today | [% comma(g.value_gain) %] Tick">[% comma(g.value) %] <img src="/static/images/[% g.valueimg %].png" alt="[% g.valueimg %]"> </td>
+               <td title="[% g.value_gain_day | commify %] Today | [% g.value_gain | commify %] Tick">[% g.value | commify %] <img src="/static/images/[% g.valueimg %].png" alt="[% g.valueimg %]"> </td>
                [% g.xpimg = (g.xp_gain_day == 0 ? 'stay' : (g.xp_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(g.xp_gain_day) %] Today | [% comma(g.xp_gain) %] Tick">[% comma(g.xp) %] <img src="/static/images/[% g.xpimg %].png" alt="[% g.xpimg %]"> </td>
+               <td title="[% g.xp_gain_day | commify %] Today | [% g.xp_gain | commify %] Tick">[% g.xp | commify %] <img src="/static/images/[% g.xpimg %].png" alt="[% g.xpimg %]"> </td>
                <td>[% g.ticks_roided %]</td>
                <td>[% g.ticks_roiding %]</td>
        </tr>
@@ -66,13 +66,13 @@
                <td align="center">[% p.ruler %] <b>OF</b> [% p.planet %]</td>
                <td align="center">[% p.race %]</td>
                [% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% comma(p.size) %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
+               <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
                [% p.scoreimg = (p.score_gain_day == 0 ? 'stay' : (p.score_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.score_gain_day) %] Today | [% comma(p.score_gain) %] Tick">[% comma(p.score) %] <img src="/static/images/[% p.scoreimg %].png" alt="[% p.scoreimg %]"> </td>
+               <td title="[% p.score_gain_day | commify %] Today | [% p.score_gain | commify %] Tick">[% p.score | commify %] <img src="/static/images/[% p.scoreimg %].png" alt="[% p.scoreimg %]"> </td>
                [% p.valueimg = (p.value_gain_day == 0 ? 'stay' : (p.value_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.value_gain_day) %] Today | [% comma(p.value_gain) %] Tick">[% comma(p.value) %] <img src="/static/images/[% p.valueimg %].png" alt="[% p.valueimg %]"> </td>
+               <td title="[% p.value_gain_day | commify %] Today | [% p.value_gain | commify %] Tick">[% p.value | commify %] <img src="/static/images/[% p.valueimg %].png" alt="[% p.valueimg %]"> </td>
                [% p.xpimg = (p.xp_gain_day == 0 ? 'stay' : (p.xp_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.xp_gain_day) %] Today | [% comma(p.xp_gain) %] Tick">[% comma(p.xp) %] <img src="/static/images/[% p.xpimg %].png" alt="[% p.xpimg %]"> </td>
+               <td title="[% p.xp_gain_day | commify %] Today | [% p.xp_gain | commify %] Tick">[% p.xp | commify %] <img src="/static/images/[% p.xpimg %].png" alt="[% p.xpimg %]"> </td>
        [% IF details %]
                <td align="center">[% p.gov %]</td>
                <td align="center">[% p.fleetvalue %] ([% p.resvalue %])</td>

diff --git a/root/src/alliances/list.tt2 b/root/src/alliances/list.tt2
index 28b9f995a36ee6167161ab456bb6e1e07d94b697..75ad9b113936920be609134c20a803b1ae59e599 100644 (file)
--- a/root/src/alliances/list.tt2
+++ b/root/src/alliances/list.tt2
@@ -23,18 +23,18 @@
                <td align="left"><a href="[% c.uri_for('edit',a.id) %]">[% a.name %]</a></td>
                <td>[% a.kmem %]</td>
                <td>[% a.members %]</td>
-               <td>[% comma(a.score) %]</td>
-               <td>[% comma(a.kscore) %]</td>
-               <td>[% comma(a.scavg) %]</td>
-               <td>[% comma(a.kscavg) %]</td>
-               <td>[% comma(a.size) %]</td>
-               <td>[% comma(a.ksize) %]</td>
-               <td>[% comma(a.siavg) %]</td>
-               <td>[% comma(a.ksiavg) %]</td>
-               <td>[% comma(a.kxp) %]</td>
-               <td>[% comma(a.kxpavg) %]</td>
-               <td>[% comma(a.kvalue) %]</td>
-               <td>[% comma(a.kvalavg) %]</td>
+               <td>[% a.score | commify %]</td>
+               <td>[% a.kscore | commify %]</td>
+               <td>[% a.scavg | commify %]</td>
+               <td>[% a.kscavg | commify %]</td>
+               <td>[% a.size | commify %]</td>
+               <td>[% a.ksize | commify %]</td>
+               <td>[% a.siavg | commify %]</td>
+               <td>[% a.ksiavg | commify %]</td>
+               <td>[% a.kxp | commify %]</td>
+               <td>[% a.kxpavg | commify %]</td>
+               <td>[% a.kvalue | commify %]</td>
+               <td>[% a.kvalavg | commify %]</td>
        </tr>
 [% END %]
 </table>

diff --git a/root/src/alliances/resources.tt2 b/root/src/alliances/resources.tt2
index 20c642de73db61485abbf7d246ddc107af6441a8..a9ce49807315627b510727eb23722b6f0d5875d1 100644 (file)
--- a/root/src/alliances/resources.tt2
+++ b/root/src/alliances/resources.tt2
@@ -17,15 +17,15 @@
                <td><a href="[% c.uri_for("edit",a.id) %]">[% a.name %]</a></td>
                <td class="[% a.relationship %]">[% a.relationship %]</td>
                <td>[% a.members %] ([% a.planets %])</td>
-               <td>[% comma(a.score) %]</td>
-               <td>[% comma(a.size) %]</td>
-               <td>[% comma(a.resources) %]</td>
-               <td>[% comma(a.hidden) %]</td>
-               <td>[% comma(a.resplanet) %]</td>
-               <td>[% comma(a.hidplanet) %]</td>
-               <td>[% comma(a.nscore) %] ([% a.nscore - a.score %])</td>
-               <td>[% comma(a.nscore2) %] ([% a.nscore2 - a.score %])</td>
-               <td>[% comma(a.nscore3) %] ([% a.nscore3 - a.score %])</td>
+               <td>[% a.score | commify %]</td>
+               <td>[% a.size | commify %]</td>
+               <td>[% a.resources | commify %]</td>
+               <td>[% a.hidden | commify %]</td>
+               <td>[% a.resplanet | commify %]</td>
+               <td>[% a.hidplanet | commify %]</td>
+               <td>[% a.nscore | commify %] ([% a.nscore - a.score %])</td>
+               <td>[% a.nscore2 | commify %] ([% a.nscore2 - a.score %])</td>
+               <td>[% a.nscore3 | commify %] ([% a.nscore3 - a.score %])</td>
        </tr>
 [% END %]
 </table>

diff --git a/root/src/members/index.tt2 b/root/src/members/index.tt2
index 902c541ff1fc355b4907a19c5af2c45e906206e7..6d9c50bf0f29f64a8f492666ae50c42047481c29 100644 (file)
--- a/root/src/members/index.tt2
+++ b/root/src/members/index.tt2
@@ -41,13 +41,13 @@
                <td align="center">[% p.ruler %] <b>OF</b> [% p.planet %]</td>
                <td align="center">[% p.race %]</td>
                [% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% comma(p.size) %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
+               <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
                [% p.scoreimg = (p.score_gain_day == 0 ? 'stay' : (p.score_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.score_gain_day) %] Today | [% comma(p.score_gain) %] Tick">[% comma(p.score) %] <img src="/static/images/[% p.scoreimg %].png" alt="[% p.scoreimg %]"> </td>
+               <td title="[% p.score_gain_day | commify %] Today | [% p.score_gain | commify %] Tick">[% p.score | commify %] <img src="/static/images/[% p.scoreimg %].png" alt="[% p.scoreimg %]"> </td>
                [% p.valueimg = (p.value_gain_day == 0 ? 'stay' : (p.value_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.value_gain_day) %] Today | [% comma(p.value_gain) %] Tick">[% comma(p.value) %] <img src="/static/images/[% p.valueimg %].png" alt="[% p.valueimg %]"> </td>
+               <td title="[% p.value_gain_day | commify %] Today | [% p.value_gain | commify %] Tick">[% p.value | commify %] <img src="/static/images/[% p.valueimg %].png" alt="[% p.valueimg %]"> </td>
                [% p.xpimg = (p.xp_gain_day == 0 ? 'stay' : (p.xp_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.xp_gain_day) %] Today | [% comma(p.xp_gain) %] Tick">[% comma(p.xp) %] <img src="/static/images/[% p.xpimg %].png" alt="[% p.xpimg %]"> </td>
+               <td title="[% p.xp_gain_day | commify %] Today | [% p.xp_gain | commify %] Tick">[% p.xp | commify %] <img src="/static/images/[% p.xpimg %].png" alt="[% p.xpimg %]"> </td>
        </tr>
 </table>
 [% END %]

diff --git a/root/src/raids/targetlist.tt2 b/root/src/raids/targetlist.tt2
index 9c906b9a19bf24bb94076780e65c47fc786f3c88..96c2384611a68a50be42478366ff888afab98cf5 100644 (file)
--- a/root/src/raids/targetlist.tt2
+++ b/root/src/raids/targetlist.tt2
@@ -32,12 +32,12 @@
                <td><a href="[% c.uri_for('/stats/planet',p.id) %]">[% p.coords %]</a></td>
                <td>[% p.alliance %]</td>
                <td>[% p.race %]</td>
-               <td>[% comma(p.score) %]</td>
-               <td>[% comma(p.value) %]</td>
-               <td>[% comma(p.xp) %]</td>
-               <td>[% comma(p.size) %]</td>
-               <td>[% comma(p.nfvalue) %]</td>
-               <td>[% comma(p.nfvalue2) %]</td>
+               <td>[% p.score | commify %]</td>
+               <td>[% p.value | commify %]</td>
+               <td>[% p.xp | commify %]</td>
+               <td>[% p.size | commify %]</td>
+               <td>[% p.nfvalue | commify %]</td>
+               <td>[% p.nfvalue2 | commify %]</td>
                <td><input type="checkbox" name="target" value="[% p.id %]"></td>
        [% IF x != p.x OR y != p.y %]
                [% x = p.x; y = p.y; %]

diff --git a/root/src/raids/view.tt2 b/root/src/raids/view.tt2
index f076c8f4ceac58fac8449d73ec272feb550db608..94244afa66af807213dfa54769c579633c2c852d 100644 (file)
--- a/root/src/raids/view.tt2
+++ b/root/src/raids/view.tt2
@@ -33,7 +33,7 @@
                <li>Race: [% t.race %]</li>
                <li>Cap: [% t.cap * 100 | format('%.02f') %]</li>
                [% FOR r IN t.roids %]
-                       <li>Roids wave [% r.wave %]: [% r.roids %] ([% comma(r.xp) %] xp)</li>
+                       <li>Roids wave [% r.wave %]: [% r.roids %] ([% r.xp | commify %] xp)</li>
                [% END %]
        </ul>
        [% IF t.comment %]
@@ -45,15 +45,15 @@
        <tr><th></th><th>Metal</th><th>Crystal</th><th>Eonium</th></tr>
        <tr align="center">
                <th>Roids</th>
-               <td>[% comma(t.metal_roids) %]</td>
-               <td>[% comma(t.crystal_roids) %]</td>
-               <td>[% comma(t.eonium_roids) %]</td>
+               <td>[% t.metal_roids | commify %]</td>
+               <td>[% t.crystal_roids | commify %]</td>
+               <td>[% t.eonium_roids | commify %]</td>
        </tr>
        <tr align="center">
                <th>Resources</th>
-               <td>[% comma(t.metal) %]</td>
-               <td>[% comma(t.crystal) %]</td>
-               <td>[% comma(t.eonium) %]</td>
+               <td>[% t.metal | commify %]</td>
+               <td>[% t.crystal | commify %]</td>
+               <td>[% t.eonium | commify %]</td>
        </tr>
 
        </table>
@@ -102,7 +102,7 @@
                <table>
                [% FOR s IN m.ships %]
                <tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-                       <td>[% s.ship %]</td><td>[% comma(s.amount) %]</td>
+                       <td>[% s.ship %]</td><td>[% s.amount | commify %]</td>
                </tr>
                [% END %]
                </table>

diff --git a/root/src/rankings/alliances.tt2 b/root/src/rankings/alliances.tt2
index 6e5e89b5ca9d75c28d60d3ba3e193d7ff06f563c..5ea227fc1ce55324794a67459a33d1b157beb949 100644 (file)
--- a/root/src/rankings/alliances.tt2
+++ b/root/src/rankings/alliances.tt2
@@ -25,13 +25,13 @@
                [% a.membersimg = (a.members_gain_day == 0 ? 'stay' : (a.members_gain_day > 0 ? 'up' : 'down')) %]
                <td title="[% a.members_gain_day %] Today | [% a.members_gain %] Tick">[% a.members %] <img src="/static/images/[% a.membersimg %].png" alt="[% a.membersimg %]"> </td>
                [% a.sizeimg = (a.size_gain_day == 0 ? 'stay' : (a.size_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(a.size_gain_day) %] Today | [% comma(a.size_gain) %] Tick">[% comma(a.size) %] <img src="/static/images/[% a.sizeimg %].png" alt="[% a.sizeimg %]"> </td>
+               <td title="[% a.size_gain_day | commify %] Today | [% a.size_gain | commify %] Tick">[% a.size | commify %] <img src="/static/images/[% a.sizeimg %].png" alt="[% a.sizeimg %]"> </td>
                [% a.scoreimg = (a.score_gain_day == 0 ? 'stay' : (a.score_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(a.score_gain_day) %] Today | [% comma(a.score_gain) %] Tick">[% comma(a.score) %] <img src="/static/images/[% a.scoreimg %].png" alt="[% a.scoreimg %]"> </td>
+               <td title="[% a.score_gain_day | commify %] Today | [% a.score_gain | commify %] Tick">[% a.score | commify %] <img src="/static/images/[% a.scoreimg %].png" alt="[% a.scoreimg %]"> </td>
                [% a.avgsizeimg = (a.avgsize_gain_day == 0 ? 'stay' : (a.avgsize_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(a.avgsize_gain_day) %] Today | [% comma(a.avgsize_gain) %] Tick">[% comma(a.avgsize) %] <img src="/static/images/[% a.avgsizeimg %].png" alt="[% a.avgsizeimg %]"> </td>
+               <td title="[% a.avgsize_gain_day | commify %] Today | [% a.avgsize_gain | commify %] Tick">[% a.avgsize | commify %] <img src="/static/images/[% a.avgsizeimg %].png" alt="[% a.avgsizeimg %]"> </td>
                [% a.avgscoreimg = (a.avgscore_gain_day == 0 ? 'stay' : (a.avgscore_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(a.avgscore_gain_day) %] Today | [% comma(a.avgscore_gain) %] Tick">[% comma(a.avgscore) %] <img src="/static/images/[% a.avgscoreimg %].png" alt="[% a.avgscoreimg %]"> </td>
+               <td title="[% a.avgscore_gain_day | commify %] Today | [% a.avgscore_gain | commify %] Tick">[% a.avgscore | commify %] <img src="/static/images/[% a.avgscoreimg %].png" alt="[% a.avgscoreimg %]"> </td>
        </tr>
 [% END %]
 </table>

diff --git a/root/src/rankings/galaxies.tt2 b/root/src/rankings/galaxies.tt2
index 5b96de2dcefcc23917b0073980fa1d63023c6c2e..c5edc2cd196f53c44e47804fedb2297f952e8a9c 100644 (file)
--- a/root/src/rankings/galaxies.tt2
+++ b/root/src/rankings/galaxies.tt2
@@ -29,15 +29,15 @@
                <td title="[% g.xprank_gain_day %] Today | [% g.xprank_gain %] Tick">[% g.xprank %] <img src="/static/images/[% g.xprankimg %].png" alt="[% g.xprankimg %]"> </td>
                <td><a href="[% c.uri_for('/stats','galaxy',g.x,g.y) %]">[% g.x %]:[% g.y %]</a></td>
                [% g.planetsimg = (g.planets_gain_day == 0 ? 'stay' : (g.planets_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% g.planets_gain_day %] Today | [% g.planets_gain %] Tick">[% comma(g.planets) %] <img src="/static/images/[% g.planetsimg %].png" alt="[% g.planetsimg %]"> </td>
+               <td title="[% g.planets_gain_day %] Today | [% g.planets_gain %] Tick">[% g.planets | commify %] <img src="/static/images/[% g.planetsimg %].png" alt="[% g.planetsimg %]"> </td>
                [% g.sizeimg = (g.size_gain_day == 0 ? 'stay' : (g.size_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% g.size_gain_day %] Today | [% g.size_gain %] Tick">[% comma(g.size) %] <img src="/static/images/[% g.sizeimg %].png" alt="[% g.sizeimg %]"> </td>
+               <td title="[% g.size_gain_day %] Today | [% g.size_gain %] Tick">[% g.size | commify %] <img src="/static/images/[% g.sizeimg %].png" alt="[% g.sizeimg %]"> </td>
                [% g.scoreimg = (g.score_gain_day == 0 ? 'stay' : (g.score_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(g.score_gain_day) %] Today | [% comma(g.score_gain) %] Tick">[% comma(g.score) %] <img src="/static/images/[% g.scoreimg %].png" alt="[% g.scoreimg %]"> </td>
+               <td title="[% g.score_gain_day | commify %] Today | [% g.score_gain | commify %] Tick">[% g.score | commify %] <img src="/static/images/[% g.scoreimg %].png" alt="[% g.scoreimg %]"> </td>
                [% g.valueimg = (g.value_gain_day == 0 ? 'stay' : (g.value_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(g.value_gain_day) %] Today | [% comma(g.value_gain) %] Tick">[% comma(g.value) %] <img src="/static/images/[% g.valueimg %].png" alt="[% g.valueimg %]"> </td>
+               <td title="[% g.value_gain_day | commify %] Today | [% g.value_gain | commify %] Tick">[% g.value | commify %] <img src="/static/images/[% g.valueimg %].png" alt="[% g.valueimg %]"> </td>
                [% g.xpimg = (g.xp_gain_day == 0 ? 'stay' : (g.xp_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(g.xp_gain_day) %] Today | [% comma(g.xp_gain) %] Tick">[% comma(g.xp) %] <img src="/static/images/[% g.xpimg %].png" alt="[% g.xpimg %]"> </td>
+               <td title="[% g.xp_gain_day | commify %] Today | [% g.xp_gain | commify %] Tick">[% g.xp | commify %] <img src="/static/images/[% g.xpimg %].png" alt="[% g.xpimg %]"> </td>
        </tr>
 [% END %]
 </table>

diff --git a/root/src/rankings/planets.tt2 b/root/src/rankings/planets.tt2
index b55b6257355fa0885c810e22aa605b21e34509b1..b0829a2c1d28010c64c69f6d9bac757fa87f9c3b 100644 (file)
--- a/root/src/rankings/planets.tt2
+++ b/root/src/rankings/planets.tt2
@@ -38,13 +38,13 @@
                <td align="center">[% p.ruler %] <b>OF</b> [% p.planet %]</td>
                <td align="center">[% p.race %]</td>
                [% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% comma(p.size) %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
+               <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
                [% p.scoreimg = (p.score_gain_day == 0 ? 'stay' : (p.score_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.score_gain_day) %] Today | [% comma(p.score_gain) %] Tick">[% comma(p.score) %] <img src="/static/images/[% p.scoreimg %].png" alt="[% p.scoreimg %]"> </td>
+               <td title="[% p.score_gain_day | commify %] Today | [% p.score_gain | commify %] Tick">[% p.score | commify %] <img src="/static/images/[% p.scoreimg %].png" alt="[% p.scoreimg %]"> </td>
                [% p.valueimg = (p.value_gain_day == 0 ? 'stay' : (p.value_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.value_gain_day) %] Today | [% comma(p.value_gain) %] Tick">[% comma(p.value) %] <img src="/static/images/[% p.valueimg %].png" alt="[% p.valueimg %]"> </td>
+               <td title="[% p.value_gain_day | commify %] Today | [% p.value_gain | commify %] Tick">[% p.value | commify %] <img src="/static/images/[% p.valueimg %].png" alt="[% p.valueimg %]"> </td>
                [% p.xpimg = (p.xp_gain_day == 0 ? 'stay' : (p.xp_gain_day > 0 ? 'up' : 'down')) %]
-               <td title="[% comma(p.xp_gain_day) %] Today | [% comma(p.xp_gain) %] Tick">[% comma(p.xp) %] <img src="/static/images/[% p.xpimg %].png" alt="[% p.xpimg %]"> </td>
+               <td title="[% p.xp_gain_day | commify %] Today | [% p.xp_gain | commify %] Tick">[% p.xp | commify %] <img src="/static/images/[% p.xpimg %].png" alt="[% p.xpimg %]"> </td>
 
        [% IF extracolumns %]
        <td align="center" class="[% p.planet_status %]"><a href="[% c.uri_for('/intel','planet',p.id) %]">[% p.nick %]([% p.planet_stats %])</a></td>

diff --git a/root/src/stats/planet.tt2 b/root/src/stats/planet.tt2
index 1c10eb209d9de20c2720b0e921b0fb5769b5b758..b139081dcb785a6857f5c5b8d32c801bdd335c25 100644 (file)
--- a/root/src/stats/planet.tt2
+++ b/root/src/stats/planet.tt2
@@ -12,15 +12,15 @@
        <tr><th>Type</th><th>Roids</th><th>Resources</th></tr>
        <tr align="right"><td align="left">Metal</td>
                <td>[% planetscan.metal_roids %]</td>
-               <td>[% comma(planetscan.metal) %]</td>
+               <td>[% planetscan.metal | commify %]</td>
        </tr>
        <tr align="right"><td align="left">Crystal</td>
                <td>[% planetscan.crystal_roids %]</td>
-               <td>[% comma(planetscan.crystal) %]</td>
+               <td>[% planetscan.crystal | commify %]</td>
        </tr>
        <tr align="right"><td align="left">Eonium</td>
                <td>[% planetscan.eonium_roids %]</td>
-               <td>[% comma(planetscan.eonium) %]</td>
+               <td>[% planetscan.eonium | commify %]</td>
        </tr>
        <tr><th>Agents</th><th><th>Guards</th></tr>
        <tr align="right"><td>[% planetscan.agents %]</td>
@@ -31,7 +31,7 @@
        <tr align="right"><td>[% planetscan.light %]</td>
                <td>[% planetscan.medium %]</td><td>[% planetscan.heavy %]</td>
        </tr>
-       <tr><th>Hidden:</th><td colspan="2" align="right">[% comma(planetscan.hidden) %]</td></tr>
+       <tr><th>Hidden:</th><td colspan="2" align="right">[% planetscan.hidden | commify %]</td></tr>
 </table>
 [% END %]
 [% IF devscan.tick %]