]> ruin.nu Git - ndwebbie.git/commitdiff
projects / ndwebbie.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d0c7c39)
target list more ajax:ish
authorMichael Andreen <harv@ruin.nu>
Fri, 15 Dec 2006 23:08:47 +0000 (23:08 +0000)
committerMichael Andreen <harv@ruin.nu>
Fri, 15 Dec 2006 23:08:47 +0000 (23:08 +0000)
include.pl patch | blob | history
index.pl patch | blob | history
raids.pl patch | blob | history
templates/skel.tmpl patch | blob | history
templates/targetlist.tmpl patch | blob | history

diff --git a/include.pl b/include.pl
index a78acc9be229a5d335d6f0866efae0ebd91aeafe..c5a5acf39417f6d525837f284a0c837eea5a62f2 100644 (file)
--- a/include.pl
+++ b/include.pl
@@ -80,7 +80,7 @@ ORDER BY r.tick+c.wave,x,y,z});
                my $coords = "Target $target->{id}";
                $coords = $target->{coords} if $target->{released_coords};
                push @targets,{Coords => $coords, Launched => $target->{launched}, Raid => $target->{raid}
-                       , Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave}};
+                       , Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave}, AJAX => $ND::AJAX};
        }
        my $template = HTML::Template->new(filename => "templates/targetlist.tmpl");
        $template->param(Targets => \@targets);
diff --git a/index.pl b/index.pl
index 537f46fed29ab15cd2f93772da02c22d66f60c7a..3d324604456016bccdcc95d625e41f59b03482e3 100755 (executable)
--- a/index.pl
+++ b/index.pl
@@ -71,6 +71,8 @@ if (param('page') =~ /^(main|check|motd|points|covop|top100|launchConfirmation|a
 our $XML = 0;
 $XML = 1 if param('xml') and $page =~ /^(raids)$/;
 
+our $AJAX = 1;
+
 my $type = 'text/html';
 if ($XML){
        $type = 'text/xml';
diff --git a/raids.pl b/raids.pl
index afbf62d20d8d7e3b5ef19c5478646391f964ef92..2b01ec5b611f23e4008444ccaed1f46d913924f3 100644 (file)
--- a/raids.pl
+++ b/raids.pl
@@ -164,12 +164,10 @@ if ($XML && param('cmd') eq 'gettargets' ){
 
 unless ($XML){
        $ND::TEMPLATE->param(TITLE => 'Raids');
-       $ND::TEMPLATE->param(HEADER => '<script type="text/javascript" src="raid.js"></script>');
+       #$ND::TEMPLATE->param(HEADER => '<script type="text/javascript" src="raid.js"></script>');
        if ($raid){#We have a raid, so list all targets
                $BODY->param(Raid => $raid->{id});
-               my $ajax = 1;
-               #$ajax = 0 if ($ENV{HTTP_USER_AGENT} =~ /MSIE/);
-               $BODY->param(Ajax => $ajax);
+               $BODY->param(Ajax => $ND::AJAX);
                my $noingal = '';
                my $planet;
                if ($ND::PLANET){
@@ -192,7 +190,7 @@ ORDER BY size});
                        my %target;
                        $target{Id} = $target->{id};
                        $target{Race} = $target->{race};
-                       $target{Ajax} = $ajax;
+                       $target{Ajax} = $ND::AJAX;
                        my $num = pow(10,length($target->{score})-2);
                        $target{Score} = ceil($target->{score}/$num)*$num;
                        $num = pow(10,length($target->{value})-2);
@@ -240,7 +238,7 @@ ORDER BY size});
                                        $xp = max(0,floor($roids * 10 * (min(2,$target{Score}/$planet->{score}) + min(2,$target{Value}/$planet->{value})-1)));
                                }
                                push @roids,{Wave => $i, Roids => $roids, XP => $xp};
-                               if ($ajax){
+                               if ($ND::AJAX){
                                        push @claims,{Wave => $i, Target => $target{Id}}
                                }else{
                                        push @claims,{Wave => $i, Target => $target{Id}, Command => 'Claim'
diff --git a/templates/skel.tmpl b/templates/skel.tmpl
index f95f672bf89f50e0b864b77612a8c6ddfb2793d4..e4bb01977f4cf5bbad0e3a22604e0e244fbb8567 100644 (file)
--- a/templates/skel.tmpl
+++ b/templates/skel.tmpl
@@ -6,6 +6,7 @@
        <title>NewDawn: <TMPL_VAR NAME=TITLE></title>
        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
        <link rel="stylesheet" type="text/css" href="nd.css"/>
+       <script type="text/javascript" src="raid.js"></script>
        <TMPL_VAR NAME=HEADER>
 </head>
 <body>
diff --git a/templates/targetlist.tmpl b/templates/targetlist.tmpl
index abfa29ad9518a8f16076dc0fb4ae39b15393ec89..032cc0c6036d360350df114ea9ab2322cb1facc2 100644 (file)
--- a/templates/targetlist.tmpl
+++ b/templates/targetlist.tmpl
@@ -1 +1 @@
-<TMPL_IF Targets><table><tr><th>Target</th><th>Landing tick</th></tr><TMPL_LOOP Targets><tr><td><a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a><TMPL_IF Launched>*</TMPL_IF></td><td><a href="raids.php?raid=<TMPL_VAR NAME=Raid>#target<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Tick></a></td><td><a href="index.pl?page=raids&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=Unclaim&amp;target=<TMPL_VAR NAME=Target>&amp;wave=<TMPL_VAR NAME=Wave>">U</a></td></tr></TMPL_LOOP></table></TMPL_IF>
+<TMPL_IF Targets><table><tr><th>Target</th><th>Tick</th></tr><TMPL_LOOP Targets><tr><td><a href="index.pl?page=check&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a><TMPL_IF Launched>*</TMPL_IF></td><td><a href="raids.php?raid=<TMPL_VAR NAME=Raid>#target<TMPL_VAR NAME=Target>"><TMPL_VAR NAME=Tick></a></td><td><TMPL_UNLESS AJAX><a href="index.pl?page=raids&amp;raid=<TMPL_VAR NAME=Raid>&amp;cmd=Unclaim&amp;target=<TMPL_VAR NAME=Target>&amp;wave=<TMPL_VAR NAME=Wave>" >U</a><TMPL_ELSE><input type="button" value="U" onclick = "claim('index.pl?page=raids&amp;xml=1&amp;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'Unclaim')"/></TMPL_UNLESS></td></tr></TMPL_LOOP></table></TMPL_IF>
The ND webbie, with scripts and database schemas