titles for buttons, and fixed error on updatetarget list

diff --git a/ND/Web/Pages/Raids.pm b/ND/Web/Pages/Raids.pm
index 65aa7e9a2ded6cce9f029d7f32947b62e8c6743e..c46571288cd3c836d8135ebdcb9e7506fe91b5dd 100644 (file)
--- a/ND/Web/Pages/Raids.pm
+++ b/ND/Web/Pages/Raids.pm
@@ -178,7 +178,7 @@ sub render_body {
                return $self->generateClaimXml($BODY,$raid,$from);
        }
        if ($self->{XML} && param('cmd') eq 'gettargets' ){
-               $_ = listTargets();
+               $_ = $self->listTargets();
                $BODY->param(TargetList => $_);
        }
 

diff --git a/ND/Web/XMLPage.pm b/ND/Web/XMLPage.pm
index 853ef42e7e48a1019f9f90c025da0fa3fc6947b1..0868ce1d829f33d16dead9b6bf25501eb28d713a 100644 (file)
--- a/ND/Web/XMLPage.pm
+++ b/ND/Web/XMLPage.pm
@@ -54,7 +54,7 @@ ORDER BY r.tick+c.wave,x,y,z});
                push @targets,{Coords => $coords, Launched => $target->{launched}, Raid => $target->{raid}
                        , Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave}
                        , AJAX => $self->{AJAX}, JoinName => $target->{joinable} ? 'N' : 'J'
-                       , Joinable => $target->{joinable} ? 'FALSE' : 'TRUE'};
+                       , Joinable => $target->{joinable} ? 'FALSE' : 'TRUE', JoinableTitle => $target->{joinable} ? 'Disable join' : 'Make target joinable'};
        }
        my $template = HTML::Template->new(filename => "templates/targetlist.tmpl", cache => 1);
        $template->param(Targets => \@targets);

diff --git a/raid.js b/raid.js
index ecebcbdb085813f7af37bc0eef802ae5410c2d96..a4179ac46ea1a492cb21dd08a91895e3dd3216ec 100644 (file)
--- a/raid.js
+++ b/raid.js
@@ -129,9 +129,11 @@ function updateClaims(dataSource,xmlthingy,timestamp){
                                var b = document.createElement("input");
                                b.type = 'button';
                                b.value = 'J';
+                               b.title = 'Make target joinable';
                                command = 'set&joinable=TRUE';
                                if (joinable == 1){
                                        b.value = 'N';
+                                       b.title = 'Disable join';
                                        command = 'set&joinable=FALSE';
                                }
                                b.setAttribute("onclick", "claim('"+dataSource+"',"+target+","+wave+",'"+command+"');");

diff --git a/templates/targetlist.tmpl b/templates/targetlist.tmpl
index 9b788c3626f514414dd39c9e75df532182ee9b21..e8b86deaa3c1bf28696cdb3ad1cfbf5085fc5fcf 100644 (file)
--- a/templates/targetlist.tmpl
+++ b/templates/targetlist.tmpl
@@ -11,9 +11,9 @@
                        <TMPL_VAR NAME=Tick></a></td>
                <td><TMPL_UNLESS AJAX><a href="raids?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" class="small" onclick = 
+                               <input title="Unclaim target" type="button" value="U" class="small" onclick = 
                                "claim('raids?xml=1&amp;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'Unclaim')"/>
-                               <input type="button" class="small" value="<TMPL_VAR NAME=JoinName>" onclick = 
+                               <input title="<TMPL_VAR NAME=JoinableTitle>" type="button" class="small" value="<TMPL_VAR NAME=JoinName>" onclick = 
                                "claim('raids?xml=1&amp;raid=<TMPL_VAR NAME=Raid>',<TMPL_VAR NAME=Target>,<TMPL_VAR NAME=Wave>,'set&amp;joinable=<TMPL_VAR NAME=Joinable>')"/>
                        </TMPL_UNLESS>
                </td>