show category and board links + add / in front of page for urls

diff --git a/ND.pm b/ND.pm
index b5aee8646a9466ef103fe415b69b22fa71ce5725..7bac9f764c9fdf145bd8e1be5d5feeb7ee01b9a8 100755 (executable)
--- a/ND.pm
+++ b/ND.pm
@@ -103,7 +103,7 @@ sub page {
                $ND::BODY = HTML::Template->new(filename => "templates/$ND::PAGE.xml.tmpl", cache => 1);
        }else{
                $ND::BODY = HTML::Template->new(filename => "templates/$ND::PAGE.tmpl", global_vars => 1, cache => 1);
-               $ND::BODY->param(PAGE => '/'.$ND::PAGE);
+               $ND::BODY->param(PAGE => $ND::PAGE);
        }
 
        $ND::BODY = $PAGES{$PAGE}->{render}->($DBH,$ND::BODY);

diff --git a/ND/Web/Forum.pm b/ND/Web/Forum.pm
index be9a10f7c5fddf550fd22cd1ae316074633e26b6..1c1ecedc9b15ec1a10b131e20c07762e07d6d0a4 100644 (file)
--- a/ND/Web/Forum.pm
+++ b/ND/Web/Forum.pm
@@ -34,7 +34,6 @@ sub viewForumThread {
 
        my $template = HTML::Template->new(filename => "templates/viewthread.tmpl", global_vars => 1, cache => 1);
 
-       $template->param(Subject => $thread->{subject});
        $template->param(Id => $thread->{id});
        $template->param(Post => $thread->{post});
 

diff --git a/ND/Web/Pages/Forum.pm b/ND/Web/Pages/Forum.pm
index cc15bad0ed0cbc3c1d88545ab3b75c8aaac10162..c9626b30381e3120a5e962c44ecb53b2cbcb2fda 100644 (file)
--- a/ND/Web/Pages/Forum.pm
+++ b/ND/Web/Pages/Forum.pm
@@ -47,11 +47,11 @@ sub render {
 
        my $board;
        if(param('b')){
-               my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board, bool_or(fa.post) AS post, bool_or(fa.moderate) AS moderate
+               my $boards = $DBH->prepare(q{SELECT fb.fbid AS id,fb.board, bool_or(fa.post) AS post, bool_or(fa.moderate) AS moderate,fb.fcid
                        FROM forum_boards fb NATURAL JOIN forum_access fa
                        WHERE fb.fbid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
                        WHERE uid = $2))
-                       GROUP BY fb.fbid,fb.board});
+                       GROUP BY fb.fbid,fb.board,fb.fcid});
                $board = $DBH->selectrow_hashref($boards,undef,param('b'),$ND::UID) or $ND::ERROR .= p($DBH->errstr);
        }
        if (param('markAsRead')){
@@ -72,11 +72,11 @@ sub render {
        }
 
        my $thread;
-       my $findThread = $DBH->prepare(q{SELECT ft.ftid AS id,ft.subject, bool_or(fa.post) AS post, bool_or(fa.moderate) AS moderate
+       my $findThread = $DBH->prepare(q{SELECT ft.ftid AS id,ft.subject, bool_or(fa.post) AS post, bool_or(fa.moderate) AS moderate,ft.fbid,fb.board,fb.fcid
                FROM forum_boards fb NATURAL JOIN forum_access fa NATURAL JOIN forum_threads ft
                WHERE ft.ftid = $1 AND (gid = -1 OR gid IN (SELECT gid FROM groupmembers
                WHERE uid = $2))
-               GROUP BY ft.ftid,ft.subject});
+               GROUP BY ft.ftid,ft.subject,ft.fbid,fb.board,fb.fcid});
        if(param('t')){
                $thread = $DBH->selectrow_hashref($findThread,undef,param('t'),$ND::UID) or $ND::ERROR .= p($DBH->errstr);
        }
@@ -99,7 +99,7 @@ sub render {
                                if ($param =~ /t:(\d+)/){
                                        $moveThread->execute(param('board'),$1,$board->{id}) or $ND::ERROR .= p($DBH->errstr);
                                        if ($moveThread->rows > 0){
-                                               log_message $ND::UID, qq{Moved thread: $1 to board: $board->{id}};
+                                               log_message $ND::UID, qq{Moved thread: $1 to board: }.param('board');
                                        }
                                }
                        }
@@ -123,7 +123,13 @@ sub render {
                ORDER BY last_post DESC});
 
        if ($thread){ #Display the thread
+               $BODY->param(Title =>  $thread->{subject});
+               $BODY->param(FBID =>  $thread->{fbid});
+               $BODY->param(Board =>  $thread->{board});
                $BODY->param(Thread => viewForumThread $thread);
+               my ($category) = $DBH->selectrow_array(q{SELECT category FROM forum_categories WHERE fcid = $1}
+                       ,undef,$thread->{fcid}) or $ND::ERROR .= p($DBH->errstr);
+               $BODY->param(Category =>  $category);
 
        }elsif(defined param('allUnread')){ #List threads in this board
                $BODY->param(AllUnread => 1);
@@ -155,10 +161,13 @@ sub render {
                $BODY->param(Categories => \@categories);
 
        }elsif($board){ #List threads in this board
-               $BODY->param(Board => $board->{board});
+               $BODY->param(ViewBoard => 1);
+               $BODY->param(Title => $board->{board});
                $BODY->param(Post => $board->{post});
                $BODY->param(Moderate => $board->{moderate});
                $BODY->param(Id => $board->{id});
+               $BODY->param(FBID => $board->{id});
+               $BODY->param(Board => $board->{board});
                my ($time) = $DBH->selectrow_array('SELECT now()::timestamp',undef);
                $BODY->param(Date => $time);
                $threads->execute($board->{id},$ND::UID,0) or $ND::ERROR .= p($DBH->errstr);
@@ -176,6 +185,10 @@ sub render {
                        my @categories;
                        while (my $category = $categories->fetchrow_hashref){
                                $boards->execute($category->{id},$ND::UID) or $ND::ERROR .= p($DBH->errstr);
+                               if ($category->{id} == $board->{fcid}){
+                                       $BODY->param(Category => $category->{category});
+                               }
+
                                my @boards;
                                while (my $b = $boards->fetchrow_hashref){
                                        next if (not $b->{post} or $b->{id} == $board->{id});

diff --git a/templates/alliances.tmpl b/templates/alliances.tmpl
index 42e3dedff4cda38fa89185d24568e088d7e11350..faac2d361cde13d49d3a52bc913cf8fd4a996f3a 100644 (file)
--- a/templates/alliances.tmpl
+++ b/templates/alliances.tmpl
@@ -24,15 +24,15 @@
 <div class="leftinfo">
 <table>
        <tr>
-               <th><a href="<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=coords">Coords</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=coords">Coords</a></th>
                <th>Nick</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=hit_us">Hit us</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=hit_us">Hit us</a></th>
                <th>Planet</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=race">Race</a></th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=size">Size (rank)</a></th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=score">Score (rank)</a></th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=value">Value (rank)</a></th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=xp">XP (rank)</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=race">Race</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=size">Size (rank)</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=score">Score (rank)</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=value">Value (rank)</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>&amp;order=xp">XP (rank)</a></th>
        </tr>
        <TMPL_LOOP Members>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
@@ -80,16 +80,16 @@
                <th>User</th>
                <th>Known members</th>
                <th>Total members</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=score">Score</a> (<a href="<TMPL_VAR NAME=PAGE>?order=kscore">known planets</a>)</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=scavg">Avg Score</a> (<a href="<TMPL_VAR NAME=PAGE>?order=kscavg">known planets</a>)</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=size">Size</a> (<a href="<TMPL_VAR NAME=PAGE>?order=ksize">known planets</a>)</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=siavg">Avg Size</a> (<a href="<TMPL_VAR NAME=PAGE>?order=ksiavg">known planets</a>)</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=kxp">XP</a> (<a href="<TMPL_VAR NAME=PAGE>?order=kxpavg">avg</a>)</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=kvalue">Value</a> (<a href="<TMPL_VAR NAME=PAGE>?order=kvalavg">avg</a>)</th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=score">Score</a> (<a href="/<TMPL_VAR NAME=PAGE>?order=kscore">known planets</a>)</th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=scavg">Avg Score</a> (<a href="/<TMPL_VAR NAME=PAGE>?order=kscavg">known planets</a>)</th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=size">Size</a> (<a href="/<TMPL_VAR NAME=PAGE>?order=ksize">known planets</a>)</th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=siavg">Avg Size</a> (<a href="/<TMPL_VAR NAME=PAGE>?order=ksiavg">known planets</a>)</th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=kxp">XP</a> (<a href="/<TMPL_VAR NAME=PAGE>?order=kxpavg">avg</a>)</th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=kvalue">Value</a> (<a href="/<TMPL_VAR NAME=PAGE>?order=kvalavg">avg</a>)</th>
        </tr>
 <TMPL_LOOP Alliances>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-               <td><a href="<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Name></a></td>
+               <td><a href="/<TMPL_VAR NAME=PAGE>?alliance=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Name></a></td>
                <td><TMPL_VAR NAME=kmem></td>
                <td><TMPL_VAR NAME=members></td>
                <td><TMPL_VAR NAME=score> (<TMPL_VAR NAME=kscore>)</td>

diff --git a/templates/calls.tmpl b/templates/calls.tmpl
index 892ee1051ac5bce5521d76b8e54e8377ea08b1b3..9fbbe6c83840bd5239c3556d32b543f7f3cbb5ed 100644 (file)
--- a/templates/calls.tmpl
+++ b/templates/calls.tmpl
@@ -74,7 +74,7 @@
        <tr><th>Call</th><th>Member (def points)</th><th>Landing tick</th><th>Races</th><th>Amount</th><th>Shiptypes</th><th>Current eta</th><th>Inital eta</th><th>Alliance</th><th>Attackers</th></tr>
 <TMPL_LOOP Calls>
        <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-               <td class="<TMPL_VAR NAME=DC>"><a href="<TMPL_VAR NAME=PAGE>?call=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Id></a></td>
+               <td class="<TMPL_VAR NAME=DC>"><a href="/<TMPL_VAR NAME=PAGE>?call=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Id></a></td>
                <td class='<TMPL_VAR NAME=DefPrio>'><TMPL_VAR NAME=Coords> <TMPL_IF Id>(<TMPL_VAR NAME=Defense_points>)<TMPL_ELSE>-New Day-</TMPL_IF></td>
                <td><TMPL_VAR NAME=Landing_tick></td>
                <td><TMPL_VAR NAME=Race></td>

diff --git a/templates/check.tmpl b/templates/check.tmpl
index 87341c84ce2a8bb5191b65779ddd4e79975a2e5a..fce88763eee4f05e8ffcf6b52508d7481e9cc842 100644 (file)
--- a/templates/check.tmpl
+++ b/templates/check.tmpl
@@ -1,11 +1,11 @@
-<p><TMPL_IF Arbiter><TMPL_VAR NAME=Arbiter><TMPL_ELSE><a href="<TMPL_VAR NAME=PAGE>?cmd=arbiter&amp;coords=<TMPL_VAR ESCAPE=URL NAME=Coords>">Do arbiter check on gal</a></TMPL_IF></p>
+<p><TMPL_IF Arbiter><TMPL_VAR NAME=Arbiter><TMPL_ELSE><a href="/<TMPL_VAR NAME=PAGE>?cmd=arbiter&amp;coords=<TMPL_VAR ESCAPE=URL NAME=Coords>">Do arbiter check on gal</a></TMPL_IF></p>
 <table>
        <tr><th>Coords</th><th>Planet</th><th>Race</th><th>Size (rank)</th><th>Score (rank)</th><th>Value (rank)</th>
                <th>XP (rank)</th><th>Fleet (Resouce) value</th><TMPL_IF isBC><th>Nick</th><th>Hit us</th><th>Alliance</th></TMPL_IF>
        </tr>
        <TMPL_LOOP Planets>
        <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-               <td><a href="<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+               <td><a href="/<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
                <td><TMPL_VAR NAME=Planet></td><td><TMPL_VAR NAME=Race></td><td><TMPL_VAR NAME=Size></td>
                <td><TMPL_VAR NAME=Score></td><td><TMPL_VAR NAME=Value></td><td><TMPL_VAR NAME=XP></td>
                <td><TMPL_VAR NAME=FleetValue></td><TMPL_IF isBC><td class="<TMPL_VAR NAME=PlanetStatus>"><a href="intel?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Nick></a></td><td><TMPL_VAR NAME=HitUs></td>

diff --git a/templates/covop.tmpl b/templates/covop.tmpl
index 4f0bff9c1ec99be9e7c0f9a77f6b0fc9be886836..1ac4a5819c7d7b7b3855a4895191988d1bedc463 100644 (file)
--- a/templates/covop.tmpl
+++ b/templates/covop.tmpl
@@ -12,7 +12,7 @@
        <td><TMPL_VAR NAME=Dists></td>
        <td><TMPL_VAR NAME=MaxResHack></td>
        <td><TMPL_VAR NAME=Username> (<TMPL_VAR NAME=LastCovOp>)</td>
-       <td><a href="<TMPL_VAR NAME=PAGE>?<TMPL_VAR NAME=List>&amp;covop=<TMPL_VAR NAME=Target>">Did CovOp this tick</a>
+       <td><a href="/<TMPL_VAR NAME=PAGE>?<TMPL_VAR NAME=List>&amp;covop=<TMPL_VAR NAME=Target>">Did CovOp this tick</a>
        </tr>
        </TMPL_LOOP>
 </table>

diff --git a/templates/editRaid.tmpl b/templates/editRaid.tmpl
index dbe1dc2e451eda149d399c9a2e6b8b0c6324de37..ced3aeca8268525968b9ca1f978449bf6fb12b59 100644 (file)
--- a/templates/editRaid.tmpl
+++ b/templates/editRaid.tmpl
@@ -6,9 +6,9 @@
                <TMPL_IF Raid>
                        <input type="hidden" name="cmd" value="change"/>
                        <input type="hidden" name="raid" value="<TMPL_VAR NAME=Raid>"/>
-                       <p><a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=Open>"><TMPL_VAR NAME=Open> raid.</a></p>
-                       <p><a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=ShowCoords>"><TMPL_VAR NAME=ShowCoordsName> coords.</a></p>
-                       <p><a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;cmd=remove">Remove raid</a></p>
+                       <p><a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=Open>"><TMPL_VAR NAME=Open> raid.</a></p>
+                       <p><a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=ShowCoords>"><TMPL_VAR NAME=ShowCoordsName> coords.</a></p>
+                       <p><a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;cmd=remove">Remove raid</a></p>
                <TMPL_ELSE>
                        <input type="hidden" name="cmd" value="submit"/>
                </TMPL_IF>
@@ -55,12 +55,12 @@
 </form>
 <TMPL_IF Raid>
        <p>Sort by:
-               <a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=coords">Coords</a>
-               <a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=race">Race</a>
-               <a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=size">Size</a>
-               <a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=score">Score</a>
-               <a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=value">Value</a>
-               <a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=xp">XP</a>
+               <a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=coords">Coords</a>
+               <a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=race">Race</a>
+               <a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=size">Size</a>
+               <a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=score">Score</a>
+               <a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=value">Value</a>
+               <a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;order=xp">XP</a>
        </p>
 <TMPL_LOOP Targets>
        <fieldset> <legend>Target: #<TMPL_VAR NAME=Id> <TMPL_VAR NAME=Coords></legend>
@@ -90,7 +90,7 @@
                </p>
        </form>
        <div class="clear">&nbsp;</div>
-       <p><a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;removeTarget=<TMPL_VAR NAME=Id>">Remove</a></p>
+       <p><a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;removeTarget=<TMPL_VAR NAME=Id>">Remove</a></p>
        </fieldset>
 </TMPL_LOOP>
 </TMPL_IF>

diff --git a/templates/forum.tmpl b/templates/forum.tmpl
index 49eb7f33c893e9d74ec7ea5952990f50fa263372..a51f0a1d8f8b935987b6ff05785350d181bcee0f 100644 (file)
--- a/templates/forum.tmpl
+++ b/templates/forum.tmpl
@@ -1,7 +1,15 @@
+<h2><TMPL_VAR NAME=Title></h2>
+<h3>
+<TMPL_IF Category>
+<a href="/<TMPL_VAR NAME=Page>"><TMPL_VAR NAME=Category></a>
+</TMPL_IF>
+<TMPL_IF FBID>
+- <a href="/<TMPL_VAR NAME=Page>?b=<TMPL_VAR NAME=FBID>"><TMPL_VAR NAME=Board></a>
+</TMPL_IF>
+</h3>
 <TMPL_VAR Thread>
-<TMPL_IF Board>
-<h2><TMPL_VAR NAME=Board></h2>
-<p><a href="<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>;markAsRead=<TMPL_VAR ESCAPE=URL NAME=DATE>">Mark threads as read</a></p>
+<TMPL_IF ViewBoard>
+<p><a href="/<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>;markAsRead=<TMPL_VAR ESCAPE=URL NAME=DATE>">Mark threads as read</a></p>
 <form action="<TMPL_VAR NAME=PAGE>#NewPosts" method="post">
 <input type="hidden" name="b" value="<TMPL_VAR NAME=Id>"/>
 <table class="boards">
@@ -15,7 +23,7 @@
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
                <td align="center"><TMPL_VAR NAME=Unread></td>
                <td align="center"><TMPL_VAR NAME=Posts></td>
-               <td><a href="<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR NAME=Subject>&nbsp;</a></td>
+               <td><a href="/<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR NAME=Subject>&nbsp;</a></td>
                <td align="center"><TMPL_VAR NAME=Last_post></td>
                <TMPL_IF Moderate><td><input type="checkbox" name="t:<TMPL_VAR NAME=Id>"/></td></TMPL_IF>
        </tr>
@@ -57,7 +65,7 @@ Move checked threads to: <select name="board">
        <TMPL_LOOP Boards>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
                <td align="center"><TMPL_VAR NAME=Unread></td>
-               <td><a href="<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Board></a></td>
+               <td><a href="/<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Board></a></td>
                <td align="center"><TMPL_VAR NAME=Last_post></td>
        </tr>
        </TMPL_LOOP>
@@ -78,14 +86,14 @@ Move checked threads to: <select name="board">
        <TMPL_LOOP Boards>
        <tr>
                <th></th>
-               <th colspan="2"><a href="<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Board></a></th>
-               <th><a href="<TMPL_VAR NAME=PAGE>/allUnread?b=<TMPL_VAR NAME=Id>;markAsRead=<TMPL_VAR ESCAPE=URL NAME=DATE>">Mark threads as read</a></th>
+               <th colspan="2"><a href="/<TMPL_VAR NAME=PAGE>?b=<TMPL_VAR NAME=Id>"><TMPL_VAR NAME=Board></a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>/allUnread?b=<TMPL_VAR NAME=Id>;markAsRead=<TMPL_VAR ESCAPE=URL NAME=DATE>">Mark threads as read</a></th>
        </tr>
                <TMPL_LOOP Threads>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
                <td align="center"><TMPL_VAR NAME=Unread></td>
                <td align="center"><TMPL_VAR NAME=Posts></td>
-               <td><a href="<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR NAME=Subject>&nbsp;</a></td>
+               <td><a href="/<TMPL_VAR NAME=PAGE>?t=<TMPL_VAR NAME=Id>#NewPosts">&nbsp;<TMPL_VAR NAME=Subject>&nbsp;</a></td>
                <td align="center"><TMPL_VAR NAME=Last_post></td>
        </tr>
                </TMPL_LOOP>

diff --git a/templates/intel.tmpl b/templates/intel.tmpl
index 81f527cc0fa42130a540e8c8a440d1949359e6fb..2a3f12af6793faf540218a37538db01edbf118c2 100644 (file)
--- a/templates/intel.tmpl
+++ b/templates/intel.tmpl
@@ -6,14 +6,14 @@
        <input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
        </p>
 </form>
-<p><a href="<TMPL_VAR NAME=PAGE>?<TMPL_IF Coords>&amp;coords=<TMPL_VAR NAME=Coords></TMPL_IF>&amp;show=all">Show all ticks</a></p>
+<p><a href="/<TMPL_VAR NAME=PAGE>?<TMPL_IF Coords>&amp;coords=<TMPL_VAR NAME=Coords></TMPL_IF>&amp;show=all">Show all ticks</a></p>
 
 <TMPL_IF CoordList>
 <table>
        <tr><th>Coords</th><th>Alliance</th></tr>
        <TMPL_LOOP CoordList>
        <tr>
-               <td><a href="<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+               <td><a href="/<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
                <td><TMPL_VAR NAME=Alliance></td>
        </tr>
        </TMPL_LOOP>
@@ -69,7 +69,7 @@
        </tr>
 <TMPL_LOOP ChannelUsers>
        <tr>
-               <td><a href="<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+               <td><a href="/<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
                <td><TMPL_VAR NAME=Alliance></td><td><TMPL_VAR NAME=Nick></td><td><TMPL_VAR NAME=Channel></td>
        </tr>
 </TMPL_LOOP>
@@ -105,14 +105,14 @@
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
        <TMPL_IF Origin>
        <td><TMPL_VAR NAME=OAlliance></td>
-       <td><a href="<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Origin>"><TMPL_VAR NAME=Origin></a></td>
+       <td><a href="/<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Origin>"><TMPL_VAR NAME=Origin></a></td>
        </TMPL_IF>
        <td class="<TMPL_VAR NAME=MissionClass>"><TMPL_VAR NAME=Mission></td>
        <td align="center"><TMPL_VAR NAME=landingtick></td>
        <td align="center"><TMPL_VAR NAME=ETA></td>
        <td><TMPL_VAR NAME=Amount></td>
        <TMPL_IF Target>
-       <td><a href="<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Target></a></td>
+       <td><a href="/<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Target></a></td>
        <td><TMPL_VAR NAME=TAlliance></td>
        </TMPL_IF>
        <td><TMPL_VAR NAME=Ingal></td>
@@ -134,7 +134,7 @@
                <td><TMPL_VAR NAME=Username></td>
                <td><TMPL_VAR NAME=Report_date></td>
                <td><TMPL_VAR NAME=Message></td>
-               <td><a href="<TMPL_VAR NAME=PAGE>?handle=<TMPL_VAR NAME=Id>">remove</a></td>
+               <td><a href="/<TMPL_VAR NAME=PAGE>?handle=<TMPL_VAR NAME=Id>">remove</a></td>
        </tr>
        </TMPL_LOOP>
 </table>

diff --git a/templates/memberIntel.tmpl b/templates/memberIntel.tmpl
index bc69dc76c8226b8172051289e7457e2d4057c59a..ea57f66277aed450487236da85a5188b2edf8d9b 100644 (file)
--- a/templates/memberIntel.tmpl
+++ b/templates/memberIntel.tmpl
@@ -1,5 +1,5 @@
 <TMPL_VAR NAME=Error>
-<p><a href="<TMPL_VAR NAME=PAGE>?show=all">Show all ticks</a></p>
+<p><a href="/<TMPL_VAR NAME=PAGE>?show=all">Show all ticks</a></p>
 <TMPL_LOOP IntelLists>
 <TMPL_IF Message><p><TMPL_VAR NAME=Message></p></TMPL_IF>
 <table>

diff --git a/templates/points.tmpl b/templates/points.tmpl
index 7a9ef5afa75f00b3b9f27f574dd5d4f35a8ba66b..33dc8522bc04c50370f2da3e656d2eb9d4216384 100644 (file)
--- a/templates/points.tmpl
+++ b/templates/points.tmpl
@@ -1,12 +1,12 @@
 <table>
        <tr>
        <th>User</th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?type=total">Total</a></th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?type=defense">Defenses</a></th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?type=attack">Attacks</a></th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?type=scan">Scans</a></th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?type=humor">Humor</a></th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?type=rank">ND Rank</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?type=total">Total</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?type=defense">Defenses</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?type=attack">Attacks</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?type=scan">Scans</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?type=humor">Humor</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?type=rank">ND Rank</a></th>
        </tr>
        <TMPL_LOOP Members>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">

diff --git a/templates/raids.tmpl b/templates/raids.tmpl
index 0361f53d82ad9dc218ba02539b18938410ae7aad..bdbd4d88ce71e2a7fa7a188cdaa4fae3ce4a591a 100644 (file)
--- a/templates/raids.tmpl
+++ b/templates/raids.tmpl
@@ -1,5 +1,5 @@
 <TMPL_LOOP Raids>
-       <p><a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>"><TMPL_VAR NAME=Raid></a>
+       <p><a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>"><TMPL_VAR NAME=Raid></a>
        <TMPL_IF isBC>
                <a href="editRaid?raid=<TMPL_VAR NAME=Raid>">Edit</a>
                <a href="editRaid?raid=<TMPL_VAR NAME=Raid>&amp;cmd=Close">Close raid.</a>
@@ -34,9 +34,9 @@
 <form action="<TMPL_VAR NAME=PAGE>" method="post">
        <p>
                <input type="button" value="Update claims"
-                       onclick = "update('<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>')"/>
+                       onclick = "update('/<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>')"/>
                <input type="button" value="Update target list"
-                       onclick = "listTargets('<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>')"/>
+                       onclick = "listTargets('/<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>')"/>
        </p>
 </form>
 </TMPL_IF>
@@ -73,12 +73,12 @@
        <TMPL_IF Ajax>
        <TMPL_LOOP Claims>
      <input type="button" value="Claim wave <TMPL_VAR NAME=Wave>"
-        onclick = "claim('<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'Claim')"/>
+        onclick = "claim('/<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'Claim')"/>
        </TMPL_LOOP>
        <TMPL_ELSE>
        <TMPL_LOOP Claims>
-       <a class="<TMPL_VAR NAME=Command>" href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=Command>&amp;target=<TMPL_VAR NAME=Target>&amp;wave=<TMPL_VAR NAME=Wave>#<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Command> wave <TMPL_VAR NAME=Wave><TMPL_IF Claimers> (<TMPL_VAR NAME=Claimers>)</TMPL_IF></a>
-       <TMPL_IF Owner><a href="<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;target=<TMPL_VAR NAME=Target>&amp;cmd=set&amp;joinable=<TMPL_IF Joinable>FALSE<TMPL_ELSE>TRUE</TMPL_IF>&amp;wave=<TMPL_VAR NAME=Wave>#<TMPL_VAR NAME=Target>"><TMPL_IF Joinable>N<TMPL_ELSE>J</TMPL_IF></a></TMPL_IF>
+       <a class="<TMPL_VAR NAME=Command>" href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;cmd=<TMPL_VAR NAME=Command>&amp;target=<TMPL_VAR NAME=Target>&amp;wave=<TMPL_VAR NAME=Wave>#<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Command> wave <TMPL_VAR NAME=Wave><TMPL_IF Claimers> (<TMPL_VAR NAME=Claimers>)</TMPL_IF></a>
+       <TMPL_IF Owner><a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;target=<TMPL_VAR NAME=Target>&amp;cmd=set&amp;joinable=<TMPL_IF Joinable>FALSE<TMPL_ELSE>TRUE</TMPL_IF>&amp;wave=<TMPL_VAR NAME=Wave>#<TMPL_VAR NAME=Target>"><TMPL_IF Joinable>N<TMPL_ELSE>J</TMPL_IF></a></TMPL_IF>
        </TMPL_LOOP>
        </TMPL_IF>
        </span>
@@ -89,7 +89,7 @@
 </TMPL_LOOP>
 <TMPL_IF Ajax>
        <script type="text/javascript">
-       update('<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>');
+       update('/<TMPL_VAR NAME=PAGE>?xml=1;raid=<TMPL_VAR NAME=Raid>');
        </script>
 </TMPL_IF>
 

diff --git a/templates/resources.tmpl b/templates/resources.tmpl
index 0ea63dc6c2f135a137b7a3a7b6a1d1772440b831..118211230151525d68e9c4781ebc79c8e90c8f1b 100644 (file)
--- a/templates/resources.tmpl
+++ b/templates/resources.tmpl
@@ -2,13 +2,13 @@
 <table>
        <tr>
                <th>Name</th><th>Relationship</th><th>Members (in res calc)</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=score">Score</a></th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=size">Size</a></th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=resources">Resources</a></th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=respplanet">Resources / Planet</a></th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=nscore">Res score (gain)</a>[1]</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=nscore2">Avg res score (gain)</a>[2]</th>
-               <th><a href="<TMPL_VAR NAME=PAGE>?order=nscore3">Estimated score</a>[3]</th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=score">Score</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=size">Size</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=resources">Resources</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=respplanet">Resources / Planet</a></th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=nscore">Res score (gain)</a>[1]</th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=nscore2">Avg res score (gain)</a>[2]</th>
+               <th><a href="/<TMPL_VAR NAME=PAGE>?order=nscore3">Estimated score</a>[3]</th>
        </tr>
 <TMPL_LOOP Alliances>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">

diff --git a/templates/top100.tmpl b/templates/top100.tmpl
index 497e369087edbf9b0925259f8d190af0c2e1875c..68c83d163235501b60ec873bb2d175011a3b5613 100644 (file)
--- a/templates/top100.tmpl
+++ b/templates/top100.tmpl
@@ -1,15 +1,15 @@
 <TMPL_VAR NAME=Error>
-<p><a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=PrevOffset>&amp;order=<TMPL_VAR NAME=Order>">Previous 100</a>
-       <a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=NextOffset>&amp;order=<TMPL_VAR NAME=Order>">Next 100</a></p>
+<p><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=PrevOffset>&amp;order=<TMPL_VAR NAME=Order>">Previous 100</a>
+       <a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=NextOffset>&amp;order=<TMPL_VAR NAME=Order>">Next 100</a></p>
 <table>
        <tr><th>Coords</th><th>Planet</th><th>Race</th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=sizerank">Size (rank)</a></th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=scorerank">Score (rank)</a></th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=valuerank">Value (rank)</a></th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=xprank">XP (rank)</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=sizerank">Size (rank)</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=scorerank">Score (rank)</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=valuerank">Value (rank)</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=xprank">XP (rank)</a></th>
        <TMPL_IF isHC>
        <th>Nick</th>
-       <th><a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=hit_us">Hit us</a></th>
+       <th><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=Offset>&amp;order=hit_us">Hit us</a></th>
        <th>Alliance</th>
        </TMPL_IF>
        </tr>
@@ -30,5 +30,5 @@
        </tr>
        </TMPL_LOOP>
 </table>
-<p><a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=PrevOffset>&amp;order=<TMPL_VAR NAME=Order>">Previous 100</a>
-       <a href="<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=NextOffset>&amp;order=<TMPL_VAR NAME=Order>">Next 100</a></p>
+<p><a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=PrevOffset>&amp;order=<TMPL_VAR NAME=Order>">Previous 100</a>
+       <a href="/<TMPL_VAR NAME=PAGE>?offset=<TMPL_VAR NAME=NextOffset>&amp;order=<TMPL_VAR NAME=Order>">Next 100</a></p>

diff --git a/templates/users.tmpl b/templates/users.tmpl
index ec0b4fa8e10af504a18372b5a6b7fa1d75ed9069..8b6a0c6a11cc7cb96640b0cfeb95be2077c7e963 100644 (file)
--- a/templates/users.tmpl
+++ b/templates/users.tmpl
@@ -65,7 +65,7 @@
        <tr><th>User</th><th>Groups</th></tr>
 <TMPL_LOOP Users>
        <tr class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-               <td><a href="<TMPL_VAR NAME=PAGE>?user=<TMPL_VAR NAME=Uid>"><TMPL_VAR NAME=Username></a></td>
+               <td><a href="/<TMPL_VAR NAME=PAGE>?user=<TMPL_VAR NAME=Uid>"><TMPL_VAR NAME=Username></a></td>
                <td><TMPL_VAR NAME=Groups></td>
        </tr>
 </TMPL_LOOP>

diff --git a/templates/viewthread.tmpl b/templates/viewthread.tmpl
index c50672eddb42576fb88e49a143b5ae80e02fa0f7..58be2c06f43ed5f0e8493e65dfc4a8c95a789e3e 100644 (file)
--- a/templates/viewthread.tmpl
+++ b/templates/viewthread.tmpl
@@ -1,4 +1,3 @@
-<h2><TMPL_VAR NAME=Subject></h2>
 <TMPL_LOOP Posts>
 <TMPL_IF NewPosts>
 <hr/>