[Rt-commit] rtir branch, 4.2-theme/countermeasures-page, repushed

[Blaine Motsinger]

The branch 4.2-theme/countermeasures-page was deleted and repushed:
       was 957ca8898bd34d521ea86130c9908c4bede1f90d
       now e444cc56c3361792a5cbdd0637aa88c9e87ef18c

1: 957ca889 ! 1: e444cc56 Migrate RTIR/Display to elevator themes
    @@ -1,9 +1,96 @@
     Author: Blaine Motsinger <blaine at bestpractical.com>
     
    -    WIP - Migrate RTIR/Display to elevator themes
    +    Migrate RTIR/Display to elevator themes
         
         This commit migrates the Countermeasure display page and elements
         to the elevator themes.
    +
    +diff --git a/html/Callbacks/RTIR/Elements/MakeClicky/Default b/html/Callbacks/RTIR/Elements/MakeClicky/Default
    +--- a/html/Callbacks/RTIR/Elements/MakeClicky/Default
    ++++ b/html/Callbacks/RTIR/Elements/MakeClicky/Default
    +@@
    +         # don't execute on non-rtir tickets or in SelfService
    +         return $super unless defined $args{type} and !$SelfService;
    + 
    +-        my $result = qq{<a class="button button-small" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
    ++        my $result = qq{<a class="button button-small btn btn-lg btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
    +             .loc('lookup "[_1]"', $host) .qq{</a>};
    +         return $super . qq{ <span class="clickylink">$result</span>};
    +     },
    +@@
    +         # don't execute on non-rtir tickets or in SelfService
    +         return $super unless defined $args{type} and !$SelfService;
    + 
    +-        my $result = qq{<a class="button button-small" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
    ++        my $result = qq{<a class="button button-small btn btn-lg btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=host&q=".$escaped_host).qq{">}
    +             .loc('lookup "[_1]"', $host) .qq{</a>};
    +         return $super . qq{ <span class="clickylink">$result</span>};
    +     },
    +@@
    + 
    +         $args{host} ||= $args{value};
    +         my $escaped_host = $escaper->($args{host});
    +-        my $result .= qq{<a class="button button-small" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=ip&q=".$escaped_host).qq{">}
    ++        my $result .= qq{<a class="button button-small btn btn-lg btn-primary" href="}. RT::IR->HREFTo("Tools/Lookup.html?".$args{lookup_params}."type=ip&q=".$escaped_host).qq{">}
    +                       .loc('Lookup IP') .q{</a>};
    +         if ( $args{incident} && !RT->Config->Get('RTIR_DisableCountermeasures') ) {
    +-            $result .= qq{<a class="button button-small create_child_} . RT::IR->lifecycle_countermeasure . qq{" href="} .
    ++            $result .= qq{<a class="button button-small btn btn-lg btn-primary create_child_} . RT::IR->lifecycle_countermeasure . qq{" href="} .
    +             RT::IR->HREFTo("CreateInQueue.html?Incident=".$args{incident}."&Lifecycle=".RT::IR->lifecycle_countermeasure.qq{&IP-Value=$escaped_host})
    +             .qq{">Block</a>};
    +         }
    +         if ( $args{'object'} && $args{'object'}->id ) {
    +             my $cf = RT::IR::GetCustomField('IP');
    +             my $tid = $args{'object'}->id;
    +-            $result .= qq{<a class="button button-small" href="}.
    ++            $result .= qq{<a class="button button-small btn btn-lg btn-primary" href="}.
    +             RT::IR->HREFTo("Edit.html?id=".$tid
    +                 .qq{&Object-RT::Ticket-$tid-CustomField-}. $cf->id .qq{-AddValue=$escaped_host}
    +                 .q{&SaveChanges=1})
    +@@
    +         my $email = $args{'value'}; $email =~ s/^<|>$//g;
    +         my $escaped_email = $escaper->($email);
    + 
    +-        my $result = qq{<a class="button button-small" href="}.
    ++        my $result = qq{<a class="button button-small btn btn-lg btn-primary" href="}.
    +             RT::IR->HREFTo(qq{Tools/Lookup.html?$args{'lookup_params'}type=email&q=$escaped_email}). qq{">}
    +             .loc('lookup email') .q{</a>};
    +         if ( $args{'incident'} ) {
    +             if ( $r->uri =~ /Lookup.html$/ ) {
    +                 $result .= qq{<input type="checkbox" name="Requestorbox-$escaped_email" unchecked />};
    +             }
    +-            $result .= qq{<a class="button button-small" href="}.
    ++            $result .= qq{<a class="button button-small btn btn-lg btn-primary" href="}.
    +                 RT::IR->HREFTo( "CreateInQueue.html"
    +                 . qq{?Incident=$args{'incident'}}
    +                 . qq{&Lifecycle=}.RT::IR->lifecycle_investigation
    +@@
    +         }
    +         my $domain = (split /@/, $email, 2)[1];
    +         my $escaped_domain = $escaper->($domain);
    +-        $result .= ' <a class="button button-small" href="'. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{'lookup_params'}type=host&q=$escaped_domain}). '">'
    ++        $result .= ' <a class="button button-small btn btn-lg btn-primary" href="'. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{'lookup_params'}type=host&q=$escaped_domain}). '">'
    +                .loc('lookup "[_1]"', $domain) .'</a>';
    +         return $escaper->($args{'value'}) . qq{ <span class="clickylink">$result</span>};
    +     },
    +@@
    +         return $escaper->($args{value}) unless defined $args{type} and !$SelfService;
    + 
    +         $args{value} = $escaper->($args{value});
    +-        my $result = qq{<a class="button button-small" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=handle&q=$args{value}}).qq{">}
    ++        my $result = qq{<a class="button button-small btn btn-lg btn-primary" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=handle&q=$args{value}}).qq{">}
    +                .loc('lookup') .qq{</a>};
    +         return $args{value} . qq{ <span class="clickylink">$result</span>};
    +     },
    +@@
    +         return $escaper->($args{value}) unless defined $args{type} and !$SelfService;
    + 
    +         $args{value} = $escaper->($args{value});
    +-        my $result = qq{<a class="button button-small" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=host&q=$args{value}}). qq{">}
    ++        my $result = qq{<a class="button button-small btn btn-lg btn-primary" href="}. RT::IR->HREFTo(qq{Tools/Lookup.html?$args{lookup_params}type=host&q=$args{value}}). qq{">}
    +                .loc('lookup host') .qq{</a>};
    +         return $args{value} . qq{ <span class="clickylink">$result</span>};
    +     },
     
     diff --git a/html/RTIR/Display.html b/html/RTIR/Display.html
     --- a/html/RTIR/Display.html